Refactor if syntax form