HFMethod refactoring