Cleaning Up CFile

Incorporating the changes in PR #2596 
I assume you just moved this around, but not actually edited it? (Just to be sure)