Improved code organization.