Refactor JabbR Client stuff