Some tidying of labels