Tidied up MAKEFILE