Improve style