Refactoring in progress.
Refactoring.