Makefile cleaned up