Marble Block code consolidation