Style fixes according to review.