Refactor into VerseClient