fixed CodeNarc violations