#152 Fix codenarc violations