Addressed comments in PR