Cleaning up the Makefile