[FIX] PR comments corrections