Fix comments and code style a bit.