Makefile tidyup
Makefile tidyup