Tidying up makefile