More refactor on AtomicVotes module.