Tidying up schematic references and values