Refactored poll classes