Tidy up Makefile to make it more readable.
my merge