HQC - Refactoring