cosmetic fixes
Merge pull request #197 from Shopify/clean_up

cosmetic fixes