Fix codenarc violations

This should fix the codenarc violations.