Style fixes 2