[TIMOB-13901] Label measurement fixes
[TIMOB-13901] Refactor + Cleanup