Simplified the makefile