Refactoring guest