Refactoring, documentation