Refactor user list