question - pr review fixes