Clean-up, uniform labels