diff --git a/socket/mysocket.c b/socket/mysocket.c
index 50bdad6..afe6b02 100644
--- a/socket/mysocket.c
+++ b/socket/mysocket.c
@@ -1,64 +1,60 @@
 #include "mysocket.h"
-
 #include <errno.h>
 
-int sock_platform_init() {
+int sock_platform_init(void) {
 #ifdef _WIN32
 	WSADATA wsaData;
 	if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
 		return -1;
 	}
-
 	if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
 		WSACleanup();
 		return -1;
 	}
 #endif
-
 	return 0;
 }
 
-int sock_close(int socket) {
+int sock_close(socket_t socket) {
 	int ret = 0;
-
 #ifdef _WIN32
 	ret = closesocket(socket);
 #else
 	ret = close(socket);
 #endif
-
 	return ret;
 }
 
-int sock_platform_shutdown() {
+int sock_platform_shutdown(void) {
 #ifdef _WIN32
 	WSACleanup();
 #endif
-
 	return 0;
 }
 
-int sock_readall(int sockfd, void *buf, size_t bufsize) {
+int sock_readall(socket_t sockfd, void *buf, size_t bufsize) {
 	char *p = (char *)buf;
 	size_t total_read = 0;
 
-	while (1) {
+	while (total_read < bufsize) {
 		int n = recv(sockfd, p, bufsize - total_read, 0);
 
 		if (n > 0) {
+			/* Data received */
 			p += n;
 			total_read += n;
-
-			if (total_read == bufsize) {
-				break;
-			}
 		} else if (n == 0) {
+			/* Connection closed */
 			break;
 		} else {
-			if (errno == EAGAIN || errno == EWOULDBLOCK) {
-				break;
-			} else if (errno == EINTR) {
+			/* Error */
+			if (errno == EINTR) {
+				/* Try again */
 				continue;
+			} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+				/* Socket non-blocking, no data right now */
+				/* Returns what has read */
+				return total_read;
 			} else {
 				return -1;
 			}
@@ -68,8 +64,8 @@ int sock_readall(int sockfd, void *buf, size_t bufsize) {
 	return total_read;
 }
 
-int sock_writeall(int socket, const void *buf, size_t n) {
-	const char *p = (char *)buf;
+int sock_writeall(socket_t socket, const void *buf, size_t n) {
+	const char *p = (const char *)buf;
 	size_t bytes_to_write = n;
 	int bytes_written;
 
@@ -82,9 +78,11 @@ int sock_writeall(int socket, const void *buf, size_t n) {
 		} else {
 			if (errno == EINTR) {
 				continue;
+			} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+				return n - bytes_to_write;
+			} else {
+				return -1;
 			}
-
-			return -1;
 		}
 	}
 
diff --git a/socket/mysocket.h b/socket/mysocket.h
index 572fa51..ab4e64c 100644
--- a/socket/mysocket.h
+++ b/socket/mysocket.h
@@ -1,38 +1,36 @@
 #ifndef MYCLIB_SOCKET_H
 #define MYCLIB_SOCKET_H
 
+#include <stddef.h>
+
 #ifdef _WIN32
-/* Windows */
-#define _WIN32_WINNT 0x0600
 #include <winsock2.h>
 #include <ws2tcpip.h>
+typedef int socket_t;
 #else
-/* Unix */
-
-#ifndef __USE_XOPEN2K
-#define __USE_XOPEN2K 1
-#endif
-
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
-
+typedef int socket_t;
 #endif
 
-/* Run this before everything */
-int sock_platform_init();
+/* Initialize the socket system */
+int sock_platform_init(void);
 
-/* Use this to close a socket */
-int sock_close(int socket);
+/* Close a socket */
+int sock_close(socket_t socket);
 
-/* Read/Write all to socket */
-int sock_readall(int sockfd, void *buf, size_t bufsize);
-int sock_writeall(int socket, const void *buf, size_t n);
+/* Clean the socket system */
+int sock_platform_shutdown(void);
 
-/* Use at exit */
-int sock_platform_shutdown();
+/*
+ * Read 'bufsize' bytes from socket
+ * Returns the read bytes, -1 on failure, 0 connection closed without issues
+ */
+int sock_readall(socket_t sockfd, void *buf, size_t bufsize);
+
+/*
+ * Writes 'n' bytes to socket
+ */
+int sock_writeall(socket_t socket, const void *buf, size_t n);
 
 #endif