Tidied and simplified Makefile