Addressed PR1 comments