more label refactoring