Improve the delete function, improve internationalization