the `if` expressions could now be inlined (I think that was not previously the case because everything was on two lines)