Refactoring recommendations again.