tracker refactoring