clean up, added voting