review comment - move index closure to finally