Minor code review changes