Formatting and comments update