Reformatting and labeling update