Fix typos, remove white space, remove search constant