Tidy up makefile