Reduce unnecessary allocations and reuse code

Reduce unnecessary allocations and reuse code #902