Cleanup Makefile a bit