LPS-22792 SF - use direct expression instead of imperative structure