Simplifying the Makefile