Updating README.md, minor refactoring