* First stylistic pass * Rework for x/o instead of and * fix typo Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> * Add changeset Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>