a little reorganizing for fanciness