Cleaned up voter.php