Cleanup and README.md update