Some more work, polising up the styles.