Tidy up schematic and part numbers