Cleaned up Makefile a bit