[minor] More changes regarding voting and code structure.