Refactored C/intermediate