Refactoring and Updating README