Tidy up and README