Improved performance by changing the work distribution
Removed a comment