simplify / style-tweak conditionals in state.py
Merge pull request #4740 from hulu/conditionals-state.py

simplify / style-tweak conditionals in state.py