waitstaff refactor