Cleaning Up CFile

Incorporating the changes in PR #2596 
First of all, very sorry for the delayed response, as I have my exams going on.
Actually I incidentally converted all my tabs with spaces. Now, I have corrected it.
Sorry for the mistake.