members refactor