Some further edits on Readme.md and refectoring