Refactoring for more readability