Improve the style