Format and coding standard changes.