Fix CodeNarc violations