1) Formatting and comment corrections