More stylistic changes.