Minor code review.
Code review fixes.