More improvement to readable cf generator