Code Review changes.
Implement code review requests