--- a/src/com/beem/project/beem/BeemService.java	Sat Nov 14 00:45:45 2009 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sat Nov 14 23:53:18 2009 +0100
@@ -36,6 +36,8 @@
      * The id to use for status notification.
      */
     public static final int NOTIFICATION_STATUS_ID = 100;
+
+    private static final String TAG = "BeemService";
     private static final int DEFAULT_XMPP_PORT = 5222;
 
     private NotificationManager mNotificationManager;
@@ -95,7 +97,7 @@
      */
     @Override
     public IBinder onBind(Intent intent) {
-	Log.d("BEEMSERVICE", "ONBIND()");
+	Log.d(TAG, "ONBIND()");
 	return mBind;
     }
 
@@ -140,7 +142,7 @@
 	Roster.setDefaultSubscriptionMode(SubscriptionMode.manual);
 	mJingle = new JingleService(mConnection.getAdaptee());
 	mBind = new XmppFacade(mConnection, this, mJingle);
-	Log.d("BEEEMSERVICE", "ONCREATE");
+	Log.d(TAG, "ONCREATE");
     }
 
     /**
@@ -152,7 +154,7 @@
 	mNotificationManager.cancel(NOTIFICATION_STATUS_ID);
 	if (mConnection.isAuthentificated())
 	    mConnection.disconnect();
-	Log.d("BEEEMSERVICE", "ONDESTROY");
+	Log.d(TAG, "ONDESTROY");
     }
 
     /**
@@ -161,7 +163,7 @@
     @Override
     public void onStart(Intent intent, int startId) {
 	super.onStart(intent, startId);
-	Log.d("BEEMSERVICE", "onStart");
+	Log.d(TAG, "onStart");
 	try {
 	    mConnection.connectAsync();
 	} catch (RemoteException e) {
@@ -196,13 +198,17 @@
     }
 
     /**
-     * init jingle from XmppConnectionAdapter.
-     * @param adaptee XmppConntection used for jingle.
+     * Initialize Jingle from an XmppConnectionAdapter.
+     * @param adaptee XmppConnection used for jingle.
      */
     public void initJingle(XMPPConnection adaptee) {
 	mJingle.initWhenConntected(adaptee);
     }
-    
+
+    /**
+     * Return a bind to an XmppFacade instance.
+     * @return IXmppFacade a bind to an XmppFacade instance
+     */
     public IXmppFacade getBind() {
 	return mBind;
     }

--- a/src/com/beem/project/beem/service/BeemChatManager.java	Sat Nov 14 00:45:45 2009 +0100
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Sat Nov 14 23:53:18 2009 +0100
@@ -71,8 +71,8 @@
 
 	/**
 	 * Create the PendingIntent to launch our activity if the user select this chat notification.
-	 * @param chat
-	 * @return
+	 * @param chat A ChatAdapter instance
+	 * @return A Chat activity PendingIntent
 	 */
 	private PendingIntent makeChatIntent(IChat chat) {