Refactoring, I think.