Cleaning up CFile
Merge pull request #2596 from abhinavagarwalla/develop

Cleaning Up CFile.