Cleaned up the makefile a little