Refactoring, lightly.