refactoring tour arguments