simplify / style-tweak conditionals in utils
Merge pull request #4736 from hulu/conditionals-utils

simplify / style-tweak conditionals in utils