Refactoring and updating README