Tidy up formatting, fix a label