CC: Code consolidation