a little reorganisation