fixed some CodeNarc violations