Documentation and refactoring names