refactor ConnectionTracker class.