Minor refactoring (part 3)