Use new xmpp-ftw API
Code tidy