Clean up and README update