further restructuring for styles.