Code clean-up
Support "root" operator