[3183] Addressed review comments.
[3183] Typo correction and one todo added.