Refactor of hc-intro