tidied Makefile