A few changes to cleanplot