Extracted some logic; pickFirstBetter not working