Style fixes again