Refactor and updating README