simplify / style-tweak conditionals in file state
Merge pull request #4741 from hulu/conditionals-file-state

simplify / style-tweak conditionals in file state