CH-830 by Zarabadoo: Polish and clean up the styles.