Issue #120: simplified code by eliminating instance vars