EveryVoice

f656bf2f - refactor: apply fixes and refactors suggested by @joanise