Clean up, example and Readme edit