Addressed left over code review comments.