Update Readme.md more and Cleanup