cleaned up save/delete methods