WIP: refactor before EDIT FORM