Refactoring methods slightly and updating README.md