Fix comments according to the style guide