minor makefile tweak and cleanup