Refactoring towards more readability.