cleanup comments and coding standard