Fix potentially uninitialized variable access
Style fixes