A few cosmetic updates in preparation for Timo's help suggestion