Cleaning up labels in code