Let the refactoring begin.