Another small cleanup
Merge pull request #1113 from alex/small-cleanup

Another small cleanup