--- a/src/com/beem/project/beem/BeemService.java	Mon Dec 21 22:44:54 2009 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Mon Dec 21 23:06:57 2009 +0100
@@ -107,6 +107,7 @@
 
     private static final String TAG = "BeemService";
     private static final int DEFAULT_XMPP_PORT = 5222;
+    private static final String COMMAND_NAMESPACE = "http://jabber.org/protocol/commands";
 
     private NotificationManager mNotificationManager;
     private XmppConnectionAdapter mConnection;
@@ -343,6 +344,7 @@
 	    pm.addIQProvider("query", "jabber:iq:version", Class.forName("org.jivesoftware.smackx.packet.Version"));
 	} catch (ClassNotFoundException e) {
 	    // Not sure what's happening here.
+	    Log.w("TestClient", "Can't load class for org.jivesoftware.smackx.packet.Version");
 	}
 	// VCard
 	pm.addIQProvider("vCard", "vcard-temp", new VCardProvider());
@@ -367,16 +369,16 @@
 	pm.addExtensionProvider("data", "http://jabber.org/protocol/ibb", new IBBProviders.Data());
 	// Privacy
 	pm.addIQProvider("query", "jabber:iq:privacy", new PrivacyProvider());
-	pm.addIQProvider("command", "http://jabber.org/protocol/commands", new AdHocCommandDataProvider());
-	pm.addExtensionProvider("malformed-action", "http://jabber.org/protocol/commands",
+	pm.addIQProvider("command", COMMAND_NAMESPACE, new AdHocCommandDataProvider());
+	pm.addExtensionProvider("malformed-action", ",
 	    new AdHocCommandDataProvider.MalformedActionError());
-	pm.addExtensionProvider("bad-locale", "http://jabber.org/protocol/commands",
+	pm.addExtensionProvider("bad-locale", COMMAND_NAMESPACE,
 	    new AdHocCommandDataProvider.BadLocaleError());
-	pm.addExtensionProvider("bad-payload", "http://jabber.org/protocol/commands",
+	pm.addExtensionProvider("bad-payload", COMMAND_NAMESPACE,
 	    new AdHocCommandDataProvider.BadPayloadError());
-	pm.addExtensionProvider("bad-sessionid", "http://jabber.org/protocol/commands",
+	pm.addExtensionProvider("bad-sessionid", COMMAND_NAMESPACE,
 	    new AdHocCommandDataProvider.BadSessionIDError());
-	pm.addExtensionProvider("session-expired", "http://jabber.org/protocol/commands",
+	pm.addExtensionProvider("session-expired", COMMAND_NAMESPACE,
 	    new AdHocCommandDataProvider.SessionExpiredError());
     }
 }

--- a/src/com/beem/project/beem/utils/BeemConnectivity.java	Mon Dec 21 22:44:54 2009 +0100
+++ b/src/com/beem/project/beem/utils/BeemConnectivity.java	Mon Dec 21 23:06:57 2009 +0100
@@ -51,18 +51,22 @@
 import android.net.wifi.WifiManager;
 import android.telephony.TelephonyManager;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class BeemConnectivity.
  */
-public class BeemConnectivity {
-    
+public final class BeemConnectivity {
+
+    /**
+     * Private constructor to forbid instantiation.
+     */
+    private BeemConnectivity() { }
+
     /**
      * Checks if is connected.
      * @param ctx the ctx
      * @return true, if is connected
      */
-    static public boolean isConnected(Context ctx) {
+    public static boolean isConnected(Context ctx) {
 	ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
 	NetworkInfo ni = cm.getActiveNetworkInfo();
 	return ni != null && ni.isConnected();

--- a/src/com/beem/project/beem/utils/FreePort.java	Mon Dec 21 22:44:54 2009 +0100
+++ b/src/com/beem/project/beem/utils/FreePort.java	Mon Dec 21 23:06:57 2009 +0100
@@ -46,7 +46,6 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 
-// TODO: Auto-generated Javadoc
 /**
  * Utility class to get a free port.
  * @author nikita

--- a/src/com/beem/project/beem/utils/PresenceType.java	Mon Dec 21 22:44:54 2009 +0100
+++ b/src/com/beem/project/beem/utils/PresenceType.java	Mon Dec 21 23:06:57 2009 +0100
@@ -45,7 +45,6 @@
 
 import org.jivesoftware.smack.packet.Presence;
 
-// TODO: Auto-generated Javadoc
 /**
  * Utility class to deal with Presence type.
  * @author nikita

--- a/src/com/beem/project/beem/utils/Status.java	Mon Dec 21 22:44:54 2009 +0100
+++ b/src/com/beem/project/beem/utils/Status.java	Mon Dec 21 23:06:57 2009 +0100
@@ -46,7 +46,6 @@
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.Presence.Mode;
 
-// TODO: Auto-generated Javadoc
 /**
  * Utility class to deal with status and presence value.
  * @author marseille
@@ -151,7 +150,7 @@
      * @return is obline
      */
     public static boolean statusOnline(int status) {
-	return (status != Status.CONTACT_STATUS_DISCONNECT && status != Status.CONTACT_STATUS_UNAVAILABLE);
+	return status != Status.CONTACT_STATUS_DISCONNECT && status != Status.CONTACT_STATUS_UNAVAILABLE;
     }
 
 }

--- a/src/com/beem/project/beem/utils/package-info.java	Mon Dec 21 22:44:54 2009 +0100
+++ b/src/com/beem/project/beem/utils/package-info.java	Mon Dec 21 23:06:57 2009 +0100
@@ -41,5 +41,8 @@
     Head of the EIP Laboratory.
 
 */
+/**
+ * This package contains utility class to deal with various aspect of BEEM.
+ */
 package com.beem.project.beem.utils;