Fixed codenarc violations
[Merge] branch 'HOT_FIX_codenarc_rules_again'