Some readability refactoring.