cleared some CodeNarc violations