Reduce naive allocations/improve readability
Test and improve work reduction