Code consolidation