small cleanup before adding improved search