Formatting
Merge branch 'master' of github.com:walmartlabs/thorax
Remove side effect in if conditional