simplify / style-tweak conditionals in file state