Cleaning Up CFile

Incorporating the changes in PR #2596 
The get implementation is there. Please recheck.