Some cleanup and uninitialized variable fix