diff --git a/popcorn.c b/popcorn.c
index 42f2d93..ee20a2b 100644
--- a/popcorn.c
+++ b/popcorn.c
@@ -1,8 +1,8 @@
 #include <libssh/libssh.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
 
 int verify_host(ssh_session session) {
   enum ssh_known_hosts_e state;
@@ -20,13 +20,13 @@ int verify_host(ssh_session session) {
   return 0;
 }
 
-int get_movies(ssh_session session, char** buffer, size_t size) {
+int get_movies(ssh_session session, char **buffer, size_t size) {
   ssh_channel channel;
   int rc;
   char read_buffer[256];
   int nbytes;
   size_t len = 0;
-  char* temp;
+  char *temp;
 
   channel = ssh_channel_new(session);
   if (channel == NULL)
@@ -39,7 +39,8 @@ int get_movies(ssh_session session, char** buffer, size_t size) {
     return rc;
   }
 
-  rc = ssh_channel_request_exec(channel, "find /var/www/public/media -type f -name \"*mp4\"");
+  rc = ssh_channel_request_exec(
+      channel, "find /var/www/public/media -type f -name \"*mp4\"");
   if (rc != SSH_OK) {
     fprintf(stderr, "Failed to request exec");
     ssh_channel_close(channel);
@@ -49,21 +50,19 @@ int get_movies(ssh_session session, char** buffer, size_t size) {
 
   nbytes = ssh_channel_read(channel, read_buffer, sizeof(read_buffer), 0);
   while (nbytes > 0) {
-		fprintf(stderr, "size: %li\tlen: %li\tnbytes: %d\n", size, len, nbytes);
-	  if ((len+=nbytes) > size) {
-			fprintf(stderr, "new len: %li\n", len);
-		  char* temp = realloc(*buffer, len);
-		  size = len;
-			if (!temp) {
-				fprintf(stderr, "Failed to reallocate char buffer");
-	      ssh_channel_close(channel);
-	      ssh_channel_free(channel);
-				return -1;
-			}
-			*buffer = temp;
-	  }
-
-	  *buffer = strcat(*buffer, read_buffer);
+    if ((len += nbytes) > size) {
+      size = len;
+      temp = realloc(*buffer, len);
+      if (!temp) {
+        fprintf(stderr, "Failed to reallocate char buffer");
+        ssh_channel_close(channel);
+        ssh_channel_free(channel);
+        return -1;
+      }
+      *buffer = temp;
+    }
+
+    memcpy(*buffer + len - nbytes, read_buffer, nbytes);
 
     nbytes = ssh_channel_read(channel, read_buffer, sizeof(read_buffer), 0);
 
@@ -126,16 +125,14 @@ int main(int argc, char *argv[]) {
     exit(-1);
   }
 
-	int size = 16;
-	char* b = malloc(size);
-	memset(b, 0, size);
+  int size = 16;
+  char *b = malloc(size);
+  memset(b, 0, size);
   if (get_movies(session, &b, size) != SSH_OK) {
     fprintf(stderr, "Unable to list movies: %s\n", ssh_get_error(session));
-		exit(-1);
+    exit(-1);
   }
 
-	fprintf(stdout, "%s", b);
-
   ssh_disconnect(session);
   ssh_free(session);
 }