Schematic tidied