Fixing some coding style and comments

Fixing PR #49