Refactored 'Tracking' Class