Style fixes based on code review