Clean up search refact