minor changes to organization