Removed class variables

Class variables are global variables, which means they are terrible.
Class instance variables are much more restricted in scope and work
for this scenario.