SE-1320 Simplify code