rescoped a couple static variables