Cleaning up makefile