Refactoring Resterson AST