Reorganize grid_search
Cleanup