diff --git a/lldb/source/API/SBCommunication.cpp b/lldb/source/API/SBCommunication.cpp
index 956b6cf..f80b114 100644
--- a/lldb/source/API/SBCommunication.cpp
+++ b/lldb/source/API/SBCommunication.cpp
@@ -16,270 +16,226 @@
 using namespace lldb;
 using namespace lldb_private;
 
+SBCommunication::SBCommunication() : m_opaque(NULL), m_opaque_owned(false) {}
 
+SBCommunication::SBCommunication(const char *broadcaster_name)
+    : m_opaque(new Communication(broadcaster_name)), m_opaque_owned(true) {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-SBCommunication::SBCommunication() :
-    m_opaque (NULL),
-    m_opaque_owned (false)
-{
+  if (log)
+    log->Printf("SBCommunication::SBCommunication (broadcaster_name=\"%s\") => "
+                "SBCommunication(%p)",
+                broadcaster_name, static_cast<void *>(m_opaque));
 }
 
-SBCommunication::SBCommunication(const char * broadcaster_name) :
-    m_opaque (new Communication (broadcaster_name)),
-    m_opaque_owned (true)
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    if (log)
-        log->Printf ("SBCommunication::SBCommunication (broadcaster_name=\"%s\") => "
-                     "SBCommunication(%p)", broadcaster_name,
-                     static_cast<void*>(m_opaque));
+SBCommunication::~SBCommunication() {
+  if (m_opaque && m_opaque_owned)
+    delete m_opaque;
+  m_opaque = NULL;
+  m_opaque_owned = false;
 }
 
-SBCommunication::~SBCommunication()
-{
-    if (m_opaque && m_opaque_owned)
-        delete m_opaque;
-    m_opaque = NULL;
-    m_opaque_owned = false;
+bool SBCommunication::IsValid() const { return m_opaque != NULL; }
+
+bool SBCommunication::GetCloseOnEOF() {
+  if (m_opaque)
+    return m_opaque->GetCloseOnEOF();
+  return false;
 }
 
-bool
-SBCommunication::IsValid () const
-{
-    return m_opaque != NULL;
+void SBCommunication::SetCloseOnEOF(bool b) {
+  if (m_opaque)
+    m_opaque->SetCloseOnEOF(b);
 }
 
-bool
-SBCommunication::GetCloseOnEOF ()
-{
-    if (m_opaque)
-        return m_opaque->GetCloseOnEOF ();
-    return false;
+ConnectionStatus SBCommunication::Connect(const char *url) {
+  if (m_opaque) {
+    if (!m_opaque->HasConnection())
+      m_opaque->SetConnection(Connection::CreateDefaultConnection(url));
+    return m_opaque->Connect(url, NULL);
+  }
+  return eConnectionStatusNoConnection;
 }
 
-void
-SBCommunication::SetCloseOnEOF (bool b)
-{
-    if (m_opaque)
-        m_opaque->SetCloseOnEOF (b);
-}
+ConnectionStatus SBCommunication::AdoptFileDesriptor(int fd, bool owns_fd) {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-ConnectionStatus
-SBCommunication::Connect (const char *url)
-{
-    if (m_opaque)
-    {
-        if (!m_opaque->HasConnection ())
-            m_opaque->SetConnection(Connection::CreateDefaultConnection(url));
-        return m_opaque->Connect (url, NULL);
+  ConnectionStatus status = eConnectionStatusNoConnection;
+  if (m_opaque) {
+    if (m_opaque->HasConnection()) {
+      if (m_opaque->IsConnected())
+        m_opaque->Disconnect();
     }
-    return eConnectionStatusNoConnection;
-}
-
-ConnectionStatus
-SBCommunication::AdoptFileDesriptor (int fd, bool owns_fd)
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    ConnectionStatus status = eConnectionStatusNoConnection;
-    if (m_opaque)
-    {
-        if (m_opaque->HasConnection ())
-        {
-            if (m_opaque->IsConnected())
-                m_opaque->Disconnect();
-        }
-        m_opaque->SetConnection (new ConnectionFileDescriptor (fd, owns_fd));
-        if (m_opaque->IsConnected())
-            status = eConnectionStatusSuccess;
-        else
-            status = eConnectionStatusLostConnection;
-    }
-
-    if (log)
-        log->Printf ("SBCommunication(%p)::AdoptFileDescriptor (fd=%d, ownd_fd=%i) => %s",
-                     static_cast<void*>(m_opaque), fd, owns_fd,
-                     Communication::ConnectionStatusAsCString (status));
-
-    return status;
-}
-
-
-ConnectionStatus
-SBCommunication::Disconnect ()
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    ConnectionStatus status= eConnectionStatusNoConnection;
-    if (m_opaque)
-        status = m_opaque->Disconnect ();
-
-    if (log)
-        log->Printf ("SBCommunication(%p)::Disconnect () => %s",
-                     static_cast<void*>(m_opaque),
-                     Communication::ConnectionStatusAsCString (status));
-
-    return status;
-}
-
-bool
-SBCommunication::IsConnected () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-    bool result = false;
-    if (m_opaque)
-        result = m_opaque->IsConnected ();
-
-    if (log)
-        log->Printf ("SBCommunication(%p)::IsConnected () => %i",
-                     static_cast<void*>(m_opaque), result);
-
-    return false;
-}
-
-size_t
-SBCommunication::Read (void *dst, size_t dst_len, uint32_t timeout_usec, ConnectionStatus &status)
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-    if (log)
-        log->Printf ("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64 ", timeout_usec=%u, &status)...",
-                     static_cast<void*>(m_opaque), static_cast<void*>(dst),
-                     static_cast<uint64_t>(dst_len), timeout_usec);
-    size_t bytes_read = 0;
-    if (m_opaque)
-        bytes_read = m_opaque->Read (dst, dst_len, timeout_usec, status, NULL);
+    m_opaque->SetConnection(new ConnectionFileDescriptor(fd, owns_fd));
+    if (m_opaque->IsConnected())
+      status = eConnectionStatusSuccess;
     else
-        status = eConnectionStatusNoConnection;
+      status = eConnectionStatusLostConnection;
+  }
 
-    if (log)
-        log->Printf ("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64 ", timeout_usec=%u, &status=%s) => %" PRIu64,
-                     static_cast<void*>(m_opaque), static_cast<void*>(dst),
-                     static_cast<uint64_t>(dst_len), timeout_usec,
-                     Communication::ConnectionStatusAsCString (status),
-                     static_cast<uint64_t>(bytes_read));
-    return bytes_read;
+  if (log)
+    log->Printf(
+        "SBCommunication(%p)::AdoptFileDescriptor (fd=%d, ownd_fd=%i) => %s",
+        static_cast<void *>(m_opaque), fd, owns_fd,
+        Communication::ConnectionStatusAsCString(status));
+
+  return status;
 }
 
+ConnectionStatus SBCommunication::Disconnect() {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-size_t
-SBCommunication::Write (const void *src, size_t src_len, ConnectionStatus &status)
-{
-    size_t bytes_written = 0;
-    if (m_opaque)
-        bytes_written = m_opaque->Write (src, src_len, status, NULL);
-    else
-        status = eConnectionStatusNoConnection;
+  ConnectionStatus status = eConnectionStatusNoConnection;
+  if (m_opaque)
+    status = m_opaque->Disconnect();
 
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-    if (log)
-        log->Printf ("SBCommunication(%p)::Write (src=%p, src_len=%" PRIu64 ", &status=%s) => %" PRIu64,
-                     static_cast<void*>(m_opaque), static_cast<const void*>(src),
-                     static_cast<uint64_t>(src_len),
-                     Communication::ConnectionStatusAsCString (status),
-                     static_cast<uint64_t>(bytes_written));
+  if (log)
+    log->Printf("SBCommunication(%p)::Disconnect () => %s",
+                static_cast<void *>(m_opaque),
+                Communication::ConnectionStatusAsCString(status));
 
-    return 0;
+  return status;
 }
 
-bool
-SBCommunication::ReadThreadStart ()
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+bool SBCommunication::IsConnected() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+  bool result = false;
+  if (m_opaque)
+    result = m_opaque->IsConnected();
 
-    bool success = false;
-    if (m_opaque)
-        success = m_opaque->StartReadThread ();
+  if (log)
+    log->Printf("SBCommunication(%p)::IsConnected () => %i",
+                static_cast<void *>(m_opaque), result);
 
-    if (log)
-        log->Printf ("SBCommunication(%p)::ReadThreadStart () => %i",
-                     static_cast<void*>(m_opaque), success);
-
-    return success;
+  return false;
 }
 
+size_t SBCommunication::Read(void *dst, size_t dst_len, uint32_t timeout_usec,
+                             ConnectionStatus &status) {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+  if (log)
+    log->Printf("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64
+                ", timeout_usec=%u, &status)...",
+                static_cast<void *>(m_opaque), static_cast<void *>(dst),
+                static_cast<uint64_t>(dst_len), timeout_usec);
+  size_t bytes_read = 0;
+  if (m_opaque)
+    bytes_read = m_opaque->Read(dst, dst_len, timeout_usec, status, NULL);
+  else
+    status = eConnectionStatusNoConnection;
 
-bool
-SBCommunication::ReadThreadStop ()
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-    if (log)
-        log->Printf ("SBCommunication(%p)::ReadThreadStop ()...",
-                     static_cast<void*>(m_opaque));
-
-    bool success = false;
-    if (m_opaque)
-        success = m_opaque->StopReadThread ();
-
-    if (log)
-        log->Printf ("SBCommunication(%p)::ReadThreadStop () => %i",
-                     static_cast<void*>(m_opaque), success);
-
-    return success;
+  if (log)
+    log->Printf("SBCommunication(%p)::Read (dst=%p, dst_len=%" PRIu64
+                ", timeout_usec=%u, &status=%s) => %" PRIu64,
+                static_cast<void *>(m_opaque), static_cast<void *>(dst),
+                static_cast<uint64_t>(dst_len), timeout_usec,
+                Communication::ConnectionStatusAsCString(status),
+                static_cast<uint64_t>(bytes_read));
+  return bytes_read;
 }
 
-bool
-SBCommunication::ReadThreadIsRunning ()
-{
-    bool result = false;
-    if (m_opaque)
-        result = m_opaque->ReadThreadIsRunning ();
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-    if (log)
-        log->Printf ("SBCommunication(%p)::ReadThreadIsRunning () => %i",
-                     static_cast<void*>(m_opaque), result);
-    return result;
+size_t SBCommunication::Write(const void *src, size_t src_len,
+                              ConnectionStatus &status) {
+  size_t bytes_written = 0;
+  if (m_opaque)
+    bytes_written = m_opaque->Write(src, src_len, status, NULL);
+  else
+    status = eConnectionStatusNoConnection;
+
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+  if (log)
+    log->Printf("SBCommunication(%p)::Write (src=%p, src_len=%" PRIu64
+                ", &status=%s) => %" PRIu64,
+                static_cast<void *>(m_opaque), static_cast<const void *>(src),
+                static_cast<uint64_t>(src_len),
+                Communication::ConnectionStatusAsCString(status),
+                static_cast<uint64_t>(bytes_written));
+
+  return 0;
 }
 
-bool
-SBCommunication::SetReadThreadBytesReceivedCallback
-(
-    ReadThreadBytesReceived callback,
-    void *callback_baton
-)
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+bool SBCommunication::ReadThreadStart() {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-    bool result = false;
-    if (m_opaque)
-    {
-        m_opaque->SetReadThreadBytesReceivedCallback (callback, callback_baton);
-        result = true;
-    }
+  bool success = false;
+  if (m_opaque)
+    success = m_opaque->StartReadThread();
 
-    if (log)
-        log->Printf ("SBCommunication(%p)::SetReadThreadBytesReceivedCallback (callback=%p, baton=%p) => %i",
-                     static_cast<void*>(m_opaque),
-                     reinterpret_cast<void*>(reinterpret_cast<intptr_t>(callback)),
-                     static_cast<void*>(callback_baton), result);
+  if (log)
+    log->Printf("SBCommunication(%p)::ReadThreadStart () => %i",
+                static_cast<void *>(m_opaque), success);
 
-    return result;
+  return success;
 }
 
-SBBroadcaster
-SBCommunication::GetBroadcaster ()
-{
-    SBBroadcaster broadcaster (m_opaque, false);
+bool SBCommunication::ReadThreadStop() {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+  if (log)
+    log->Printf("SBCommunication(%p)::ReadThreadStop ()...",
+                static_cast<void *>(m_opaque));
 
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+  bool success = false;
+  if (m_opaque)
+    success = m_opaque->StopReadThread();
 
-    if (log)
-        log->Printf ("SBCommunication(%p)::GetBroadcaster () => SBBroadcaster (%p)",
-                     static_cast<void*>(m_opaque),
-                     static_cast<void*>(broadcaster.get()));
+  if (log)
+    log->Printf("SBCommunication(%p)::ReadThreadStop () => %i",
+                static_cast<void *>(m_opaque), success);
 
-    return broadcaster;
+  return success;
 }
 
-const char *
-SBCommunication::GetBroadcasterClass ()
-{
-    return Communication::GetStaticBroadcasterClass().AsCString();
+bool SBCommunication::ReadThreadIsRunning() {
+  bool result = false;
+  if (m_opaque)
+    result = m_opaque->ReadThreadIsRunning();
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+  if (log)
+    log->Printf("SBCommunication(%p)::ReadThreadIsRunning () => %i",
+                static_cast<void *>(m_opaque), result);
+  return result;
+}
+
+bool SBCommunication::SetReadThreadBytesReceivedCallback(
+    ReadThreadBytesReceived callback, void *callback_baton) {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+
+  bool result = false;
+  if (m_opaque) {
+    m_opaque->SetReadThreadBytesReceivedCallback(callback, callback_baton);
+    result = true;
+  }
+
+  if (log)
+    log->Printf("SBCommunication(%p)::SetReadThreadBytesReceivedCallback "
+                "(callback=%p, baton=%p) => %i",
+                static_cast<void *>(m_opaque),
+                reinterpret_cast<void *>(reinterpret_cast<intptr_t>(callback)),
+                static_cast<void *>(callback_baton), result);
+
+  return result;
+}
+
+SBBroadcaster SBCommunication::GetBroadcaster() {
+  SBBroadcaster broadcaster(m_opaque, false);
+
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+
+  if (log)
+    log->Printf("SBCommunication(%p)::GetBroadcaster () => SBBroadcaster (%p)",
+                static_cast<void *>(m_opaque),
+                static_cast<void *>(broadcaster.get()));
+
+  return broadcaster;
+}
+
+const char *SBCommunication::GetBroadcasterClass() {
+  return Communication::GetStaticBroadcasterClass().AsCString();
 }
 
 //
-//void
-//SBCommunication::CreateIfNeeded ()
+// void
+// SBCommunication::CreateIfNeeded ()
 //{
 //    if (m_opaque == NULL)
 //    {