[transforms] Code clean-up