Refactoring, yeah...