Improve polls controller