Minor refactoring
Minor refactoring (part 2)