Some minor cleanup
Merge pull request #161 from Yelp/minor_cleanup

Some minor cleanup