a little reorganizing