Improved matplotlib usage