Fixed comments and coding standards