Cleaned up the makefile