Code cleanup
Important bugfix about caching result and new vote / remove vote...