More refactoring for readability.