diff --git a/Makefile b/Makefile
index c9c00e6546a4c243084f89478161ecd7f1efbbf3..4b25fb98ba986beaa60cf02f1ae864697b60f5cc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,29 +6,49 @@ ifeq ($(BINARY_C),)
   $(error BINARY_C is not set)
 endif
 
-
-CC      := gcc
-LD      := gcc
+# Name of program
 PROGRAM := binary_c_python_api
-MAKE    := /usr/bin/make
-LIBS 	:= -lbinary_c $(shell $(BINARY_C)/binary_c-config --libs)
-#`$(BINARY_C)/binary_c-config --libdirs_list` 
-C_SRC   := binary_c_python_api.c
-OBJECTS := $(C_SRC:.c=.o)
-OBJ_FLAGS := -c
-CFLAGS := -fPIC $(shell $(BINARY_C)/binary_c-config --flags | sed s/-fvisibility=hidden// ) -I$(BINARY_C)/src/ -I$(BINARY_C)/src/API 
-SO_FLAGS := -shared -o
-SO_NAME := libbinary_c_api.so
+
+# some commands
+CC      	:= gcc
+LD      	:= gcc
+MAKE    	:= /usr/bin/make
+
+# Libraries
+LIBS 		:= -lbinary_c $(shell $(BINARY_C)/binary_c-config --libs)
+
+# Source files and cflags
+C_SRC   	:= binary_c_python_api.c
+CFLAGS 		:= -fPIC $(shell $(BINARY_C)/binary_c-config --flags | sed s/-fvisibility=hidden// )
+
+# Incdirs
+INCDIRS 	:= -I$(BINARY_C)/src/ -I$(BINARY_C)/src/API
+
+# Object files and flags
+OBJECTS 	:= $(C_SRC:.c=.o)
+OBJ_FLAGS 	:= -c
+
+# Shared lib files and flags
+SO_NAME 	:= libbinary_c_api.so
+SO_FLAGS 	:= -shared -o
 
 # To create python shared library
-PY_EXEC := python3
-PY_SETUP := setup.py
-PY_OPTIONS := build_ext --inplace
-
-all: $(OBJECTS)
-	$(CC) -DBINARY_C=$(BINARY_C) $(CFLAGS) $(INCDIRS) $(C_SRC) $(OBJ_FLAGS) $(INCDIRS) $(LIBS) 
-	$(CC) -DBINARY_C=$(BINARY_C) $(SO_FLAGS) $(SO_NAME) $(OBJECTS)
-	$(PY_EXEC) $(PY_SETUP) $(PY_OPTIONS) 
+PY_EXEC 	:= python3
+PY_SETUP 	:= setup.py
+PY_OPTIONS 	:= build_ext --inplace
+
+
+all:
+	$(CC) -DBINARY_C=$(BINARY_C) $(CFLAGS) $(INCDIRS) $(C_SRC) $(OBJ_FLAGS) $(LIBS) 
+	#$(CC) -DBINARY_C=$(BINARY_C) $(SO_FLAGS) $(SO_NAME) $(OBJECTS)
+	#$(PY_EXEC) $(PY_SETUP) $(PY_OPTIONS) 
+
+test:	
+	@echo Objects: $(OBJECTS)
+	@echo Libs: $(LIBS)
+	@echo C_SRC: $(C_SRC)
+	@echo CFLAGS: $(CFLAGS)
+	@echo INCDIRS: $(INCDIRS)
 
 clean:
 	rm -f *.o *.so
diff --git a/old_makefile b/old_makefile
deleted file mode 100644
index c9c00e6546a4c243084f89478161ecd7f1efbbf3..0000000000000000000000000000000000000000
--- a/old_makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Makefile for Rapid Binary Star Evolution program
-
-# you will need to set the BINARY_C variable to point
-# to the root binary_c directory
-ifeq ($(BINARY_C),)
-  $(error BINARY_C is not set)
-endif
-
-
-CC      := gcc
-LD      := gcc
-PROGRAM := binary_c_python_api
-MAKE    := /usr/bin/make
-LIBS 	:= -lbinary_c $(shell $(BINARY_C)/binary_c-config --libs)
-#`$(BINARY_C)/binary_c-config --libdirs_list` 
-C_SRC   := binary_c_python_api.c
-OBJECTS := $(C_SRC:.c=.o)
-OBJ_FLAGS := -c
-CFLAGS := -fPIC $(shell $(BINARY_C)/binary_c-config --flags | sed s/-fvisibility=hidden// ) -I$(BINARY_C)/src/ -I$(BINARY_C)/src/API 
-SO_FLAGS := -shared -o
-SO_NAME := libbinary_c_api.so
-
-# To create python shared library
-PY_EXEC := python3
-PY_SETUP := setup.py
-PY_OPTIONS := build_ext --inplace
-
-all: $(OBJECTS)
-	$(CC) -DBINARY_C=$(BINARY_C) $(CFLAGS) $(INCDIRS) $(C_SRC) $(OBJ_FLAGS) $(INCDIRS) $(LIBS) 
-	$(CC) -DBINARY_C=$(BINARY_C) $(SO_FLAGS) $(SO_NAME) $(OBJECTS)
-	$(PY_EXEC) $(PY_SETUP) $(PY_OPTIONS) 
-
-clean:
-	rm -f *.o *.so
-	rm -rf build/