Finishes BFS for Q1
Some cleanup