[TASK] Expand a few boolean comparisons to full legibility