First round of improvements to the schema -- mostly formatting but some breaking changes.
Reformatted whitespace for schema