Clean up and add correct labels