Refactoring
editable fields