fixing review comments