diff --git a/code/makefile b/code/makefile
index 08f4925..66301da 100644
--- a/code/makefile
+++ b/code/makefile
@@ -14,21 +14,24 @@ endif
 
 compiler = gfortran
 
+
+# Modules
+MODULES += \
+    Compact.o\
+    post.o
+
+# Objects
+OBJ     = test.o
+
 Post_Cbar_FSD_Incomp : x-edge-cold-bc-uPrime-hybrid
 
-x-edge-cold-bc-uPrime-hybrid : test.o post.o Compact.o
-	${compiler} -o x-edge-cold-bc-uPrime-hybrid ${flags} test.o post.o Compact.o 
+x-edge-cold-bc-uPrime-hybrid : ${MODULES} ${OBJ}
+	${compiler} -o x-edge-cold-bc-uPrime-hybrid ${flags} ${MODULES} ${OBJ}
 
-test.o  : test.f90 post.mod compact.mod
-	${compiler} -c ${flags} test.f90
+${OBJ} : ${MODULES}
 
-post.o post.mod: post.f90 compact.mod
-	rm -f post.mod
-	${compiler} -c ${flags} post.f90
-
-Compact.o compact.mod: Compact.f90
-	rm -f compact.mod
-	${compiler} -c ${flags} Compact.f90
+%.o: %.f90
+	${compiler} -c ${flags} $<
 
 clean:
-	rm *.o *.mod x-edge-cold-bc-uPrime-hybrid
+	rm -f *.o *.mod x-edge-cold-bc-uPrime-hybrid