tidied up makefile a bit