Cleaning Up CFile

Incorporating the changes in PR #2596 
Leave a new line character after for, while, if, etc blocks. Unless it is to close the block with a right brace }.