Class Variables Cleanup

Moved Class Variables to make them Class Globals only.