just a little reorganization