Minor code review updates