More code review cleanup