cleaned up the makefile a bit