Style changes re: Bryce Allen code review