(x) CTL-429 Several code improvements for StyleHelper