Moved global vars to own file