Reformulate to something nicer as per @abadger's advice