Improving organization of styles