code review fixes.