shortened master-schema to schema and cleaned up some of the cli arg handling code