clean up the Makefile a bit
edits