Thank you @mradcliffe for the quick review.
Updated the patch with the review...