diff --git a/src/amqp_client.h b/src/amqp_client.h
index 7de1634..d0fe132 100644
--- a/src/amqp_client.h
+++ b/src/amqp_client.h
@@ -12,9 +12,8 @@ namespace QAMQP
 
 class Exchange;
 class Queue;
-class ClientPrivate;
 class Authenticator;
-class ConnectionPrivate;
+class ClientPrivate;
 class QAMQP_EXPORT Client : public QObject
 {
     Q_OBJECT
diff --git a/src/amqp_frame.cpp b/src/amqp_frame.cpp
index 7d07b31..4274b24 100644
--- a/src/amqp_frame.cpp
+++ b/src/amqp_frame.cpp
@@ -27,7 +27,8 @@ Type Base::type() const
 }
 
 Base::~Base()
-{}
+{
+}
 
 void Base::setChannel(qint16 channel)
 {
@@ -291,7 +292,7 @@ QDataStream &Frame::deserialize(QDataStream &stream, Frame::TableField &f)
     stream >> data;
     QDataStream s(&data, QIODevice::ReadOnly);
 
-    while(!s.atEnd()) {
+    while (!s.atEnd()) {
         qint8 valueType = 0;
         QString name = readField('s', s).toString();
         s >> valueType;
diff --git a/src/amqp_network.cpp b/src/amqp_network.cpp
index 6b05cc8..b10a3b5 100644
--- a/src/amqp_network.cpp
+++ b/src/amqp_network.cpp
@@ -24,7 +24,7 @@ Network::~Network()
 
 void Network::connectTo(const QString &host, quint16 port)
 {
-    if(!socket_) {
+    if (!socket_) {
         qWarning("AMQP: Socket didn't create.");
         return;
     }
@@ -39,7 +39,7 @@ void Network::connectTo(const QString &host, quint16 port)
 
     if (isSsl()) {
 #ifndef QT_NO_SSL
-        static_cast<QSslSocket *>(socket_.data())->connectToHostEncrypted(h, p);
+        static_cast<QSslSocket*>(socket_.data())->connectToHostEncrypted(h, p);
 #else
         qWarning("AMQP: You library has builded with QT_NO_SSL option.");
 #endif
@@ -110,7 +110,7 @@ void Network::readyRead()
                 if (frame.methodClass() == Frame::fcConnection) {
                     m_pMethodHandlerConnection->_q_method(frame);
                 } else {
-                    foreach(Frame::MethodHandler *pMethodHandler, m_methodHandlersByChannel[frame.channel()])
+                    foreach (Frame::MethodHandler *pMethodHandler, m_methodHandlersByChannel[frame.channel()])
                         pMethodHandler->_q_method(frame);
                 }
             }
@@ -118,14 +118,14 @@ void Network::readyRead()
             case Frame::ftHeader:
             {
                 Frame::Content frame(streamB);
-                foreach(Frame::ContentHandler *pMethodHandler, m_contentHandlerByChannel[frame.channel()])
+                foreach (Frame::ContentHandler *pMethodHandler, m_contentHandlerByChannel[frame.channel()])
                     pMethodHandler->_q_content(frame);
             }
                 break;
             case Frame::ftBody:
             {
                 Frame::ContentBody frame(streamB);
-                foreach(Frame::ContentBodyHandler *pMethodHandler, m_bodyHandlersByChannel[frame.channel()])
+                foreach (Frame::ContentBodyHandler *pMethodHandler, m_bodyHandlersByChannel[frame.channel()])
                     pMethodHandler->_q_body(frame);
             }
                 break;
@@ -143,10 +143,13 @@ void Network::readyRead()
 
 void Network::sendFrame(const Frame::Base &frame)
 {
-    if (socket_->state() == QAbstractSocket::ConnectedState) {
-        QDataStream stream(socket_);
-        frame.toStream(stream);
+    if (socket_->state() != QAbstractSocket::ConnectedState) {
+        qDebug() << Q_FUNC_INFO << "socket not connected: " << socket_->state();
+        return;
     }
+
+    QDataStream stream(socket_);
+    frame.toStream(stream);
 }
 
 bool Network::isSsl() const
diff --git a/src/amqp_network.h b/src/amqp_network.h
index 481005c..71ba375 100644
--- a/src/amqp_network.h
+++ b/src/amqp_network.h
@@ -23,8 +23,6 @@ public:
     ~Network();
 
     void disconnect();
-    void sendFrame();
-
     void sendFrame(const Frame::Base &frame);
 
     bool isSsl() const;
@@ -41,7 +39,7 @@ public:
     void addContentHandlerForChannel(Channel channel, Frame::ContentHandler *pHandler);
     void addContentBodyHandlerForChannel(Channel channel, Frame::ContentBodyHandler *pHandler);
 
-public slots:
+public Q_SLOTS:
     void connectTo(const QString &host = QString(), quint16 port = 0);
     void error(QAbstractSocket::SocketError socketError);