Formatting and comment update