Conform format

Effort to conform to format of previous versions.