a little reorganization (maybe more later)