code shrinking and removing a var

(no functional change)