Clean up AST part 2
Clean up Ast part three