Improved formatting

Improved formatting