Fixing codenarc
[Merge] branch 'fixing'