Further CodeNarc code violation fixes