Take care of some formatting issues.

Take care of some comments about code style raised in pull request #42