Code clean-up
Support IF