Minor cleanup
Merge pull request #199 from twitter/storm-summer

Minor cleanup