Refactoring and cleaning: Moved tsch
Small fix for jennic
Trivial changes