Formatting and comment improvements.