code cleanup for HFMethod