Minor code review comments