Simplifying first poll logic