Cleaned up the Makefile slightly