Converted global variables to proper ivars.