Refactoring, I guess.