Refactor tracktor