Just minor tweaks, mostly cosmetic