Reviewer-related refactoring