Refactor conditional expression node