Cleaning some things up, simpler plots