Improves core logic organization.