Polling refactoring