Clean up style a bit