improved style (I think...)