Whitespace and style fixes after pull request #65