tidying makefile again