Updates to formatting, style, and comments

Updates to formatting, style, and comments