some style reorganizing