Minor refactoring (part 3.1)
Minor refactoring (part 3.2)