Refactor a bit the label methods for tracker