Slight cleanup in HLT CF/DF generation code

This MRs does not add/change CF building functionality. Just clarified meaning of some variables, names etc. It is in preparation for a better CA and CF building integration. Tagging @fpastore who wrote this code.