Cleanup and labeling