schemas: make formatting more idomatic
schemas: more fixes from pull-request feedback