Further cleanup to form styles.