Tidied up some matplotlib.mpl (deprecated) bits