Cleaned up search class