Formatting fix ups