Improve code organization.