Improve the style just a bit