Cleaning Up CFile

Incorporating the changes in PR #2596 
Indentation is completely fine in my editor. I am not sure why git is messing it up. Will look for a solution and update.