Refactor labels