Cosmetic changes to plot + small API change
Intermediate version that works with with statement
second intermediate version