Refactored polls