Revert "reduce usage of instance vars for helper methods"

This reverts commit 2c55ff3f8ce561117602f55f7d626910db476651.