Improve the editable_by scope
Rename a var