Refactored labels