Cleanups, implemented plot6