LPS-44643 Simplify. Avoid too much indentation