Tidied up makefile