Massively refactoring styles.