Minor refactoring
14.2.2.2