improve the editor for return