Code clean up, fixing CodeNarc Violations