tidying everything
tidying Makefile