Refactoring. Inrease readability