Clean up and labeling