Continue cleanup and refactoring.