fix comments and coding style