Fix comments and style