Cleanup + some pylab to pyplot switch