Refactoring hard.