Clean up the style a bit