One step further into the refactoring.
One step further into the refactoring...