Rerefactoring!