refactoring of labels