UI-3327 Organize the variables