Minor refactoring to improve readability.