Refactoring for guest tracking