Formatting improvements

Formatting improvements