Removed two of the global variables