Changes to the formatting
Formatting and comments