Style fixes in models