#390 Style fixes