A little cleanup and README editing