hf refactor done