VE-1104 Simplify logic