refactor the wanted varibles and replace underscore in the cf1 and cf2 m...

...odel