improve style, or at least I think so