Addressed comments in pr review