Minor Makefile cleanup