some organizational changes in styles