Cosmetic tweaks to arrive function.