refactor tracker player