attempt to improve style a little bit