clean up Makefile a bit