working on cleaning up schematic