diff --git a/src/main.rs b/src/main.rs
index 9a5cad5..f77295b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,8 @@
 use tonic::{Request, transport::Channel};
 use grpc::stream_list::{
-    v3_data_live_chat_message_service_client::V3DataLiveChatMessageServiceClient, LiveChatMessageListRequest
+    v3_data_live_chat_message_service_client::V3DataLiveChatMessageServiceClient
 };
-use grpc::{auth_header, get_live_id};
+use grpc::{auth_header, construct_request};
 mod grpc;
 
 #[tokio::main]
@@ -12,14 +12,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .await?;
     let mut client = V3DataLiveChatMessageServiceClient::with_interceptor(channel, auth_header);
 
-    let request = Request::new(LiveChatMessageListRequest {
-        part: vec!["snippet".to_string()],
-        live_chat_id: Some(get_live_id(String::from("linlyboi"))),
-        max_results: Some(20),
-        page_token: None,
-        hl: None,
-        profile_image_size: None,
-    });
+	let request = construct_request(String::from("linlyboi"));
 
     let response = client.stream_list(request).await?;