Cleanup and README update