Cleanup and README docs