Readability

Made it more readable, also added support for xmpp