More readability refactorings.