Small cleanup
Merge pull request #2418 from bradfol/cleanup

Small cleanup