Refactoring and Documenting methods