poll administration and code cleanup