Cleaning Up CFile #2569

Incorporating the changes in PR #2596