Cleaning up Makefile