Refactoring, possibly.