Fixing review comments

Fixing review comments