Improve style a bit