diff --git a/Makefile b/Makefile
index a305460..5a3a0d0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,80 +6,41 @@
 #    By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2022/09/27 08:39:27 by cchauvet          #+#    #+#              #
-#    Updated: 2022/10/23 19:34:26 by cchauvet         ###   ########.fr        #
+#    Updated: 2022/10/28 17:26:03 by cchauvet         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-SRCS   = ft_isalpha.c \
-		 ft_isdigit.c \
-		 ft_isalnum.c \
-		 ft_isascii.c \
-		 ft_isprint.c \
-	   	 ft_strlen.c \
-		 ft_memset.c \
-		 ft_bzero.c \
-		 ft_memcpy.c \
-		 ft_memmove.c \
-		 ft_strlcpy.c \
-		 ft_strlcat.c \
-		 ft_toupper.c \
-		 ft_tolower.c \
-		 ft_strchr.c \
-		 ft_strrchr.c \
-		 ft_strncmp.c \
-	   	 ft_memchr.c \
-		 ft_memcmp.c \
-		 ft_strnstr.c \
-		 ft_atoi.c \
-		 ft_calloc.c \
-		 ft_strdup.c \
-		 ft_substr.c \
-		 ft_strjoin.c \
-		 ft_strtrim.c \
-		 ft_split.c \
-		 ft_itoa.c \
-		 ft_strmapi.c \
-	   	 ft_striteri.c \
-		 ft_putchar_fd.c \
-		 ft_putstr_fd.c \
-		 ft_putendl_fd.c \
-		 ft_putnbr_fd.c
-
-BSRCS   = ft_lstnew.c \
-		 ft_lstadd_front.c \
-		 ft_lstsize.c \
-		 ft_lstlast.c \
-		 ft_lstadd_back.c \
-		 ft_lstdelone.c \
-		 ft_lstclear.c \
-		 ft_lstiter.c \
-		 ft_lstmap.c
-
-OBJS = ${SRCS:.c=.o}
-
-BOBJS = ${BSRCS:.c=.o}
-
-NAME = libft.a
-
-CFLAG = -Wall -Werror -Wextra
+CC     := gcc
+SRCS   := ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c \
+  ft_strlen.c ft_memset.c ft_bzero.c ft_memcpy.c ft_memmove.c ft_strlcpy.c \
+  ft_strlcat.c ft_toupper.c ft_tolower.c ft_strchr.c ft_strrchr.c ft_strncmp.c \
+  ft_memchr.c ft_memcmp.c ft_strnstr.c ft_atoi.c ft_calloc.c ft_strdup.c \
+  ft_substr.c ft_strjoin.c ft_strtrim.c ft_split.c ft_itoa.c ft_strmapi.c \
+  ft_striteri.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c
+BSRCS   := ft_lstnew.c ft_lstadd_front.c ft_lstsize.c ft_lstlast.c \
+  ft_lstadd_back.c ft_lstdelone.c ft_lstclear.c ft_lstiter.c ft_lstmap.c
+OBJS    := $(SRCS:.c=.o)
+BOBJS   := $(BSRCS:.c=.o)
+NAME    := libft.a
+CFLAGS  := -Wall -Werror -Wextra
 
 %.o: %.c libft.h
-	${CC} ${CFLAG} -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
-all: ${NAME}
+all: $(NAME)
 
-${NAME}: ${OBJS}
-	ar -rc ${NAME}.a ${OBJS}
+$(NAME): $(OBJS)
+	ar -rc $(NAME) $(OBJS)
 
-bonus: ${OBJS} ${BOBJS} 
-	ar -rc ${NAME} ${OBJS} ${BOBJS} 
+bonus: $(OBJS) $(BOBJS) 
+	ar -rc $(NAME) $(OBJS) $(BOBJS) 
 	
 clean:
-	rm -f ${OBJS} ${BOBJS}
+	rm -f $(OBJS) $(BOBJS)
 
 fclean: clean
-	rm -f ${NAME}
+	rm -f $(NAME)
 
 re: fclean all
 
-.PHONY: bonus extra clean fclean re
+.PHONY: all bonus clean fclean re
diff --git a/ft_calloc.c b/ft_calloc.c
index 1fc3cef..398f394 100644
--- a/ft_calloc.c
+++ b/ft_calloc.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/27 16:09:01 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/10/04 14:56:44 by cchauvet         ###   ########.fr       */
+/*   Updated: 2022/10/28 17:31:12 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/ft_isalnum.c b/ft_isalnum.c
index d0fbab4..92bd4f5 100644
--- a/ft_isalnum.c
+++ b/ft_isalnum.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/26 11:15:04 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/09/27 11:32:40 by cchauvet         ###   ########.fr       */
+/*   Updated: 2022/10/28 17:31:44 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,9 +14,9 @@
 
 int	ft_isalnum(int c)
 {
-	if ((('9' >= c && c >= '0')
-			|| ('z' >= c && c >= 'a')
-			|| ('Z' >= c && c >= 'A')))
+	if (('9' >= c && c >= '0')
+		|| ('z' >= c && c >= 'a')
+		|| ('Z' >= c && c >= 'A'))
 		return (1);
 	return (0);
 }
diff --git a/ft_split.c b/ft_split.c
index 455b0d1..1ab69f5 100644
--- a/ft_split.c
+++ b/ft_split.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/05 19:04:34 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/10/05 20:47:09 by cchauvet         ###   ########.fr       */
+/*   Updated: 2022/10/28 18:28:41 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -66,6 +66,7 @@ static char	**ft_segsplitter(char **tab, size_t len, const char *s, char c)
 		start = let_index;
 		while (s[let_index] != c && s[let_index] != 0)
 			let_index++;
+	
 		tab[tab_index] = ft_substr(s, start, let_index - start);
 		if (tab[tab_index] == NULL)
 			return (ft_cancel(tab, tab_index));