Fixed style issues found with pull request #940.

Fixed a few style issues found with pull request #940 including switching camel case to underscores and brackets to do/end.