Refactoring and organization.