diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 3b7b6f5..642414b 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -2,7 +2,9 @@ lib_LIBRARIES = libparser.a
 
 libparser_a_SOURCES =  \
   parser.c \
-  parsing_utils.c
+  grammar.c \
+  grammar_basic.c \
+  grammar_advanced.c
 
 libparser_a_CPPFLAGS = -I$(top_srcdir)/src
 
diff --git a/src/parser/grammar.h b/src/parser/grammar.h
index d2c1551..a5ec6e2 100644
--- a/src/parser/grammar.h
+++ b/src/parser/grammar.h
@@ -51,12 +51,12 @@ struct firsts_list {
  * @return PARSER_INIT_SUCCESS on success PARSER_INIT_ERROR on error
  * @warning Do not use outside the parser
  */
- bool grammar_init(void);
+bool grammar_init(void);
 
 /* @brief Closes the grammar submodule
  * @warning Do not use outside the parser
  */
- void grammar_close(void);
+void grammar_close(void);
 
 /* @brief Acts as the entry point of the parser, calls parse_list
  *
diff --git a/src/parser/grammar_basic.h b/src/parser/grammar_basic.h
index ba3c817..cb49172 100644
--- a/src/parser/grammar_basic.h
+++ b/src/parser/grammar_basic.h
@@ -1,8 +1,8 @@
 #ifndef GRAMMAR_BASIC_H
 #define GRAMMAR_BASIC_H
 
-#include "../utils/ast/ast.h"
 #include "../lexer/lexer.h"
+#include "../utils/ast/ast.h"
 
 // === Functions
 
diff --git a/src/parser/parser.h b/src/parser/parser.h
index b51d2f5..a79497b 100644
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -6,7 +6,8 @@
 #include "../lexer/lexer.h"
 #include "../utils/ast/ast.h"
 
-enum parser_state {
+enum parser_state
+{
     PARSER_STATE_NOT_INITIALIZED = 0,
     PARSER_STATE_READY,
     PARSER_STATE_CLOSED