Mostly style related changes.