cleaning AST
polishing calls