diff --git a/lib/src/reverse_engineering/youtube_http_client.dart b/lib/src/reverse_engineering/youtube_http_client.dart
index 44a571e..44a5d61 100644
--- a/lib/src/reverse_engineering/youtube_http_client.dart
+++ b/lib/src/reverse_engineering/youtube_http_client.dart
@@ -1,5 +1,4 @@
 import 'package:http/http.dart';
-import 'package:meta/meta.dart';
 
 import '../exceptions/exceptions.dart';
 import '../videos/streams/streams.dart';
@@ -53,10 +52,9 @@ class YoutubeHttpClient {
     return response.body;
   }
 
-  Stream<List<int>> getStream(dynamic url,
-      {Map<String, String> headers,
-      @required StreamInfo streamInfo,
-      bool validate = true}) async* {
+  Stream<List<int>> getStream(StreamInfo streamInfo,
+      {Map<String, String> headers, bool validate = true}) async* {
+    var url = streamInfo.url;
     if (!streamInfo.isRateLimited()) {
       var request = Request('get', url);
       request.headers.addAll(_userAgent);
diff --git a/lib/src/videos/streams/streams_client.dart b/lib/src/videos/streams/streams_client.dart
index 4cdf323..a311ad6 100644
--- a/lib/src/videos/streams/streams_client.dart
+++ b/lib/src/videos/streams/streams_client.dart
@@ -245,13 +245,7 @@ class StreamsClient {
     return hlsManifest;
   }
 
-  //TODO: Test this
   /// Gets the actual stream which is identified by the specified metadata.
-  Stream<List<int>> get(StreamInfo streamInfo) {
-    return _httpClient.getStream(streamInfo.url, streamInfo: streamInfo);
-  }
-
-//TODO: Implement CopyToAsync
-
-//TODO: Implement DownloadAsync
+  Stream<List<int>> get(StreamInfo streamInfo) =>
+      _httpClient.getStream(streamInfo);
 }