CS fixes

- trailing whitespace
Merge branch 'hotfix/cs'

Fixes CS issues