Addressed review's comment and suggestion.