Clean up Ast, add visitor
Clean up Ast