Tidied up Makefiles