Tidy up organization.