Cosmetic mods

No change to logic