HCLuster: small refactor