NXP-15073: Replace style by helper class