Refactoring for poll chats