Fixed some CodeNarc violations