cleaned up my global variables