Update Readme

This PR also contains the code style fixes