Refactor and Cleanup Tarjans