cleaned up save/delete/prepare methods