Refactoring(more readable)