Improve naming, organization, and notation