Adhere to coding standards.
Merge pull request #229 from akalankapagoda/reviewFixes

Adhere to coding standards.