make conditionals clearer