Choosing simpler select and little CR fixes