refactoring trakcers