Some minor "cosmetic" changes.