Neatened up search(), thanks @nickdepinet
nixed justification for old bad code