tidied up labelling