cosmetic cleanups on schematic