Cleaned up vote code
Merged changes