some tweaks
Remove some unneeded allocations