Code review notes fixed.