added more cleanup to make structure