Style fixes

Style fixes