More formatting related changes.