Issue #120: eliminated more instance vars