Poll retrieval refactoring