cleanup and README.md updates