Clean up code
Don't send more nodes to search as a list