Refactoring and Documentation