Refactor editable fields