Refactoring (again)
Refactoring (again)