The great refactoring continues!