Refactoring, mostly.