Formatting and comments fixes.