fixed some 'low hanging fruit' violations to please CodeNarc