AX: cleanup style and naming and code in accessibility search mechanism