Cleaned up the Makefile