Addressed comments in PR.