tidied up Makefile