Further simplifying and cleaning up Makefile