search: cleanup variable names and lossless comments