Clean up codenarc violations