Whitespace
Merge pull request #3298 from ussuri/minor-cleanups

Whitespace