Code cleanup
Even more classifier histograms.