Tidy the makefiles