Minor changes to organization.