Updated CH version.
Style cleanup.