Streamlined the makefile