Formatting cleanup per conventions.