Fix codenarc errors
Merge pull request #70 from Skyr/fix-codenarc

Fix codenarc violations
Fix codenarc violations