Tidy up Makefile