makefile tidying