Readability refactoring.