Fixing codenarc violations
[Merge] branch 'fixing'