Working on the style a bit