tidying
More conversion to AST