More stylistic changes