refactor members