Style fixes to pull request #216