Cleaning Up CFile

Incorporating the changes in PR #2596 
Same as above regarding the new line.