simplify / style-tweak conditionals in master.py
Merge pull request #4738 from hulu/conditionals-master

simplify / style-tweak conditionals in master.py