diff --git a/lib/modem-commands.js b/lib/modem-commands.js
index f817b13..0e6bb9f 100644
--- a/lib/modem-commands.js
+++ b/lib/modem-commands.js
@@ -16,7 +16,7 @@ function writeToPort(data) {
         port.write(data, (err, bytesWritten) => {
             if (err) logger.warn(`ERROR: ${err.toString()}`);
 
-            logger.verbose('OUTGOING', { bytesWritten, data: data.toString() });
+            logger.verbose('OUTGOING', { data: data.toString(), bytesWritten, err });
             resolve(bytesWritten);
         });
     });
@@ -38,19 +38,15 @@ exports.writeToPortAndWaitForReadline = function writeToPortAndWaitForReadline(c
 };
 
 exports.writeToPortAndWaitForOkOrError = function writeToPortAndWaitForOkOrError(cmd, lockName) {
-    const parserName = 'customParserWaitForOkOrError';
     return new Promise(async (resolve) => {
         const parser = new ParserRegex({ regex: /(?:OK|ERROR)\r\n/ });
         parser.on('data', (data) => {
-            logger.verbose('INCOMING', { parser: parserName, data: data.toString() });
-            logger.verbose(`Unpiping ${parserName}`);
             port.unpipe(parser);
             mutex.unlock(lockName || MUTEX_COMMAND, cmd.trim());
             resolve(data);
         });
 
         await mutex.lock(lockName || MUTEX_COMMAND, cmd.trim());
-        logger.verbose(`Piping ${parserName}`);
         port.pipe(parser);
         await writeToPort(cmd);
     });
@@ -95,7 +91,7 @@ exports.queryIMEI = function queryIMEI() {
     return new Promise(async (resolve) => {
         const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX });
         parser.on('data', (data) => {
-            logger.verbose('INCOMING', { parser: 'parserIMEI', data: data.toString() });
+            logger.verbose('INCOMING', { data: data.toString(), parser: 'parserIMEI' });
             port.unpipe(parser);
             mutex.unlock(MUTEX_COMMAND, 'queryIMEI');
             modemInfo.imei = data.toString().trim();
@@ -113,7 +109,7 @@ exports.queryIMSI = function queryIMSI() {
     return new Promise(async (resolve) => {
         const parser = new ParserRegex({ regex: parsers.PARSER_WAIT_FOR_OK_OR_ERROR_REGEX });
         parser.on('data', (data) => {
-            logger.verbose('INCOMING', { parser: 'parserIMSI', data: data.toString() });
+            logger.verbose('INCOMING', { data: data.toString(), parser: 'parserIMSI' });
             port.unpipe(parser);
             mutex.unlock(MUTEX_COMMAND, 'queryIMSI');
             modemInfo.imsi = data.toString().trim();
diff --git a/lib/serialport-parsers.js b/lib/serialport-parsers.js
index b62e4d4..1d70950 100644
--- a/lib/serialport-parsers.js
+++ b/lib/serialport-parsers.js
@@ -90,7 +90,7 @@ function isResultCodeIs(data, resultCode) {
 
 const parserReadline = new ParserReadline({ delimiter: PARSER_READLINE_DELIMITER });
 parserReadline.on('data', (data) => {
-    logger.verbose('INCOMING', { parser: 'parserReadLine', data: `${data.toString()}${PARSER_READLINE_DELIMITER}` });
+    logger.verbose('INCOMING', { data: `${data.toString()}${PARSER_READLINE_DELIMITER}`, parser: 'parserReadLine' });
 
     if (!data) return;
 
@@ -121,7 +121,7 @@ parserReadline.on('data', (data) => {
 
 const parserWaitForOkOrError = new ParserRegex({ regex: PARSER_WAIT_FOR_OK_OR_ERROR_REGEX });
 parserWaitForOkOrError.on('data', (data) => {
-    logger.verbose('INCOMING', { parser: 'parserWaitForOkOrError', data: data.toString() });
+    logger.verbose('INCOMING', { data: data.toString(), parser: 'parserWaitForOkOrError' });
 });