A refactoring suggestion