Minor fix for uninitialized vars.
Add initialization of some variables and useless code.
Merge pull request #749 from Tithugues/fix-unitialized

Minor: Fix unitialized variables