UI-2530: improvement style