Cleanup and README update.