Cosmetic tweaks for @smblott-github