Done to both, added visitTree and change to name arg with name of pretty.