Minor makefile cleanup