--- a/src/com/beem/project/beem/ui/AddContact.java	Fri Dec 18 20:32:43 2009 +0100
+++ b/src/com/beem/project/beem/ui/AddContact.java	Fri Dec 18 21:28:53 2009 +0100
@@ -80,6 +80,7 @@
     private IXmppFacade mXmppFacade;
     private final ServiceConnection mServConn = new BeemServiceConnection();
     private final BeemBroadcastReceiver mReceiver = new BeemBroadcastReceiver();
+    private final OkListener mOkListener = new OkListener();
 
     static {
 	SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
@@ -170,7 +171,10 @@
 	return widget.getText().toString();
     }
 
-    private final OnClickListener mOkListener = new OnClickListener() {
+    /**
+     * Listener.
+     */
+    private class OkListener implements OnClickListener {
 
 	@Override
 	public void onClick(View v) {

--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Fri Dec 18 20:32:43 2009 +0100
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Fri Dec 18 21:28:53 2009 +0100
@@ -122,7 +122,7 @@
 
 	mClear = (Button) findViewById(R.id.ChangeStatusClear);
 	mClear.setOnClickListener(mOnClickOk);
-	
+
 	mContact = (Button) findViewById(R.id.OpenContactList);
 	mContact.setOnClickListener(mOnClickOk);
 

--- a/src/com/beem/project/beem/ui/Chat.java	Fri Dec 18 20:32:43 2009 +0100
+++ b/src/com/beem/project/beem/ui/Chat.java	Fri Dec 18 21:28:53 2009 +0100
@@ -151,7 +151,7 @@
 	super.onCreate(savedBundle);
 	setContentView(R.layout.chat);
 	this.registerReceiver(mBroadcastReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
-	
+
 	// UI
 	mContactNameTextView = (TextView) findViewById(R.id.chat_contact_name);
 	mContactStatusMsgTextView = (TextView) findViewById(R.id.chat_contact_status_msg);

--- a/src/com/beem/project/beem/ui/PrivacyList.java	Fri Dec 18 20:32:43 2009 +0100
+++ b/src/com/beem/project/beem/ui/PrivacyList.java	Fri Dec 18 21:28:53 2009 +0100
@@ -288,6 +288,10 @@
 	}
     }
 
+    /**
+     * Service connection.
+     * @author jamu
+     */
     private final class BeemServiceConnection implements ServiceConnection {
 
 	private IXmppFacade mXmppFacade;
@@ -321,6 +325,10 @@
 	}
     }
 
+    /**
+     * Listener.
+     * @author jamu
+     */
     private class PrivacyListListener extends IPrivacyListListener.Stub {
 
 	@Override