Small tweaks, mostly cosmetic