Tweaks

A couple of tweaks from other branches/repos.

* tweak language string for clarity
* simplify conditions