cleaned up some unnecessary global… variables