fix CC-61 and fix some minor linting stuff
Merge pull request #933 from control-center/bugfix/CC-61

fix CC-61 and fix some minor linting stuff