Cleaning Up CFile

Incorporating the changes in PR #2596 
Not sure why the change in this line, but that's fine.