Further decruft and standardize styles.