More consistent refactoring