Minor refactoring of minor refactoring