Fixing codenarc violations