Converted a few class variables to local variables.