Refactor members