Cleaning Up CFile

Incorporating the changes in PR #2596 
I am being annoying here but one line for this is fine.