+ Style fixes