HCL Refactoring