Schematic layout and labeling cleanup