refactor & fix edit member