Style fixes for previous commit