Slightly improved performance.
Removed unecessary allocations.