Improve the style a little :)