Removed some ugliness from schematic.