Refactored hist2D