member refactor