Tidy up Makefile and update README