Remove superfluous variable. Comment tweaks.