Makefile has been tidied up.