Clean up of Makefile