cleaned up edit and delete