More clean up and work to FindState()