Deal with comments raised by armoo in pull request:

* Create new logger for xmpp
* Put doc comments in the right place
* Fix method naming to be consistent with rest of code