Move leader election back into __init__

1. New leader election