cleaned up Makefile a bit