ENH: Cleanup presentation of some labels