Code cleanup in voter controller