Cleaning Up CFile

Incorporating the changes in PR #2596 
It seems you have completely indented the whole file in a new way. I am not sure why.