Cleanup and README changes