Moved global variables to their own class