Codenarc violations cleaned