Cleaned up Makefile