Added beautifier class, updated the log and the lexer