Readme changes and some identation changes in code