Refactor Tracker