Removing class variables in the generator to allow for threading.