First steps to constructing a voter. Cleaned up things.