Agreed. Refactoring.