fix some comments and style