cleaned up makefile a bit