Minor - Improve code style - refs CT#7383