Lovely re-factor. Solid spot!

Done.