Cleaning Up CFile

Earlier, I had made an attempt at this issue, but forgot to run tests against it. Now, they are passing all the tests.