Mostly refactoring.
Refactoring.