Cleaning up search class