Fixing some comments and coding style issues