Remove some allocation
Make src tree flatter