Tatamibot refactoring