cleanup, static global vars moved into class with get/set interface