Refactor: main.ml
Merge branch 'refactor_main' into develop