Tidied up the makefiles