Minor refactoring for consistency