Major reformatting of the spec.