Simple marshal optimization, layout changed, source formatted