Would it not be better/clearer to nest this in the above IF?