Streamline the makefile