Cleaning up and fixing the Makefile