Mostly formatting related changes.