Few stylistic changes