Fix one Wunitialized and related cleanups
Merge pull request #68 from Eyescale/master

Fix one Wunitialized and related cleanups