Tidy up of Makefile