Remove some redundant code.
Update the styles.