More, similar refactoring