save, a little clean up