Clean up and Readme changed