Improve organization.