Fixing review comments