Minor refactoring for readability.