Style fixes 3