More Refactoring to C.