Minor Makefile clean up