Finish interpreter and improve parse tree structure