Clean-up.
HTML output formatter improvements.