Ajtalk internal refactor