cleaned some
Merge pull request #89 from GroupDenseKitchen/cleaning-of-code-Erik's

cleaned some