Functions are slightly better organized, mainly in that we can now access the histogram list