Cleaned up schematics