Refactor: Remove duplicate member-save code