Cleaned up schematic a bit