Refactor tracking w/OHYGameTracking base class