Comments formatting and style updates

I think I'm done.