fixed some comment and coding style