ANTLR Tree Parsing is improved but not clear yet