simplify/style-tweak/refactor rest of the conditionals
Merge pull request #4745 from hulu/conditionals-long-tail

simplify/style-tweak/refactor rest of the conditionals