Formatting and “interface fixes” (schemas, separators, brackets)