Initial code review changes.