Advanced labeling + clean up