Further refactoring of styles.