Cleaning Up CFile

Incorporating the changes in PR #2596 
Yes, its better that way. I would update it.