remove generators and use if else block to grab only members