And more refactoring.