Implemented HaniCollector.
Addressed code-analysis errors.