Addressed old TODO: try to make it so only non-team-members are listed
improve comments