Minor refactoring of definition