Minor tidying. Labelling