Cleaning up the makefile