Small improvements in style