Revert "Occurred to me that some of those variables are local, so changed them to private"

This reverts commit e502554959388dccda2c0aeedc6fad6fa65b9f1b.