Refactoring cleanup.