refactor of editable classes