Style fixes from code review