Small code cleanup, no change in behavior
Merge pull request #673 from ussuri/small-cleanups

Small code cleanup, no change in behavior