Further simplify tool picker