CQS-ify

Cyclomatic complexity = 22 (same as GitHub's internal styles)
Line length = 120
prefer english operators (new option, not reflected yet, however is referred to)