Cleaned up makefile a bit