Refactoring waiterbot