diff --git a/lib/src/event_manager/notifier_events.dart b/lib/src/event_manager/notifier_events.dart
index ef6e3e09..945e735b 100644
--- a/lib/src/event_manager/notifier_events.dart
+++ b/lib/src/event_manager/notifier_events.dart
@@ -1,5 +1,4 @@
 import 'package:sip_ua/src/sip_message.dart';
-
 import 'events.dart';
 
 class EventTerminated extends EventType {
diff --git a/lib/src/grammar_parser.dart b/lib/src/grammar_parser.dart
index 6eee4599..47eaebb6 100644
--- a/lib/src/grammar_parser.dart
+++ b/lib/src/grammar_parser.dart
@@ -1,8 +1,9 @@
 // This code was generated by a tool.
 // Processing tool available at https://github.com/mezoni/peg
 
-import 'dart:core';
 import 'dart:convert';
+import 'dart:core';
+
 import 'data.dart';
 import 'name_addr_header.dart';
 import 'uri.dart';
diff --git a/lib/src/rtc_session.dart b/lib/src/rtc_session.dart
index 1de029d6..37ee0622 100644
--- a/lib/src/rtc_session.dart
+++ b/lib/src/rtc_session.dart
@@ -1,9 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
+
 import 'package:crypto/crypto.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 import 'package:sdp_transform/sdp_transform.dart' as sdp_transform;
 import 'package:sdp_transform/sdp_transform.dart';
+
 import 'package:sip_ua/sip_ua.dart';
 import 'constants.dart' as DartSIP_C;
 import 'constants.dart';
diff --git a/lib/src/sanity_check.dart b/lib/src/sanity_check.dart
index 112672f0..01d1884a 100644
--- a/lib/src/sanity_check.dart
+++ b/lib/src/sanity_check.dart
@@ -2,9 +2,9 @@ import 'constants.dart' as DartSIP_C;
 import 'constants.dart';
 import 'logger.dart';
 import 'sip_message.dart';
+import 'socket_transport.dart';
 import 'transactions/invite_server.dart';
 import 'transactions/non_invite_server.dart';
-import 'socket_transport.dart';
 import 'ua.dart';
 import 'utils.dart' as Utils;
 
diff --git a/lib/src/sip_ua_helper.dart b/lib/src/sip_ua_helper.dart
index f8fbaac0..2ec1e5fe 100644
--- a/lib/src/sip_ua_helper.dart
+++ b/lib/src/sip_ua_helper.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 import 'package:logger/logger.dart';
+
 import 'package:sip_ua/sip_ua.dart';
 import 'package:sip_ua/src/map_helper.dart';
-
 import 'package:sip_ua/src/transports/socket_interface.dart';
 import 'package:sip_ua/src/transports/tcp_socket.dart';
 import 'config.dart';
diff --git a/lib/src/transactions/invite_client.dart b/lib/src/transactions/invite_client.dart
index 7ee4d86e..7c1a93a6 100644
--- a/lib/src/transactions/invite_client.dart
+++ b/lib/src/transactions/invite_client.dart
@@ -5,8 +5,8 @@ import '../constants.dart';
 import '../event_manager/internal_events.dart';
 import '../logger.dart';
 import '../sip_message.dart';
-import '../timers.dart';
 import '../socket_transport.dart';
+import '../timers.dart';
 import '../ua.dart';
 import '../utils.dart';
 import 'transaction_base.dart';
diff --git a/lib/src/transactions/invite_server.dart b/lib/src/transactions/invite_server.dart
index 6e92538c..f42246b2 100644
--- a/lib/src/transactions/invite_server.dart
+++ b/lib/src/transactions/invite_server.dart
@@ -3,8 +3,8 @@ import 'dart:async';
 import '../event_manager/internal_events.dart';
 import '../logger.dart';
 import '../sip_message.dart';
-import '../timers.dart';
 import '../socket_transport.dart';
+import '../timers.dart';
 import '../ua.dart';
 import 'transaction_base.dart';
 
diff --git a/lib/src/transactions/non_invite_client.dart b/lib/src/transactions/non_invite_client.dart
index 3b2ba5fc..ee725543 100644
--- a/lib/src/transactions/non_invite_client.dart
+++ b/lib/src/transactions/non_invite_client.dart
@@ -4,8 +4,8 @@ import '../event_manager/event_manager.dart';
 import '../event_manager/internal_events.dart';
 import '../logger.dart';
 import '../sip_message.dart';
-import '../timers.dart';
 import '../socket_transport.dart';
+import '../timers.dart';
 import '../ua.dart';
 import '../utils.dart';
 import 'transaction_base.dart';
diff --git a/lib/src/transactions/non_invite_server.dart b/lib/src/transactions/non_invite_server.dart
index fffc25a9..d801b8e3 100644
--- a/lib/src/transactions/non_invite_server.dart
+++ b/lib/src/transactions/non_invite_server.dart
@@ -3,8 +3,8 @@ import 'dart:async';
 import 'package:sip_ua/src/sip_message.dart';
 import '../event_manager/internal_events.dart';
 import '../logger.dart';
-import '../timers.dart';
 import '../socket_transport.dart';
+import '../timers.dart';
 import '../ua.dart';
 import 'transaction_base.dart';
 
diff --git a/test/test_classes.dart b/test/test_classes.dart
index 9efe9e28..5ef70df4 100644
--- a/test/test_classes.dart
+++ b/test/test_classes.dart
@@ -1,6 +1,7 @@
+import 'package:test/test.dart';
+
 import 'package:sip_ua/src/name_addr_header.dart';
 import 'package:sip_ua/src/uri.dart';
-import 'package:test/test.dart';
 
 List<void Function()> testFunctions = <void Function()>[
   () => test('Class: URI', () {
diff --git a/test/test_digest_authentication.dart b/test/test_digest_authentication.dart
index a77b269a..a7738209 100644
--- a/test/test_digest_authentication.dart
+++ b/test/test_digest_authentication.dart
@@ -1,6 +1,7 @@
+import 'package:test/test.dart';
+
 import 'package:sip_ua/src/constants.dart';
 import 'package:sip_ua/src/digest_authentication.dart';
-import 'package:test/test.dart';
 
 // Results of this tests originally obtained from RFC 2617 and:
 // 'https://pernau.at/kd/sipdigest.php'
diff --git a/test/test_normalize_target.dart b/test/test_normalize_target.dart
index 79ce6147..37f7f0ed 100644
--- a/test/test_normalize_target.dart
+++ b/test/test_normalize_target.dart
@@ -1,6 +1,7 @@
+import 'package:test/test.dart';
+
 import 'package:sip_ua/src/uri.dart';
 import 'package:sip_ua/src/utils.dart' as Utils;
-import 'package:test/test.dart';
 
 List<void Function()> testFunctions = <void Function()>[
   () => test('NormalizeTarget: valid targets', () {
diff --git a/test/test_parser.dart b/test/test_parser.dart
index 71e251f4..5409d874 100644
--- a/test/test_parser.dart
+++ b/test/test_parser.dart
@@ -1,8 +1,9 @@
+import 'package:test/test.dart';
+
 import 'package:sip_ua/src/data.dart';
 import 'package:sip_ua/src/grammar.dart';
 import 'package:sip_ua/src/name_addr_header.dart';
 import 'package:sip_ua/src/uri.dart';
-import 'package:test/test.dart';
 
 List<void Function()> testFunctions = <void Function()>[
   () => test('Parser: Host => [ domain, ipv4, ipv6 ].', () {
diff --git a/test/test_sip_message_parser.dart b/test/test_sip_message_parser.dart
index 8a9369a1..4b4018cd 100644
--- a/test/test_sip_message_parser.dart
+++ b/test/test_sip_message_parser.dart
@@ -1,6 +1,6 @@
-import 'package:sip_ua/src/parser.dart';
 import 'package:test/test.dart';
 
+import 'package:sip_ua/src/parser.dart';
 import 'data/sip_message.dart';
 
 List<void Function()> testFunctions = <void Function()>[
diff --git a/test/test_sip_ua.dart b/test/test_sip_ua.dart
index 17af0e99..1b4c8118 100644
--- a/test/test_sip_ua.dart
+++ b/test/test_sip_ua.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 
+import 'package:test/test.dart';
+
 import 'package:sip_ua/src/config.dart' as config;
 import 'package:sip_ua/src/event_manager/event_manager.dart';
 import 'package:sip_ua/src/transports/socket_interface.dart';
 import 'package:sip_ua/src/transports/web_socket.dart';
 import 'package:sip_ua/src/ua.dart';
-import 'package:test/test.dart';
 
 late UA ua;
 void main() {
diff --git a/test/test_websocket.dart b/test/test_websocket.dart
index 81ac1d59..cad2dda5 100644
--- a/test/test_websocket.dart
+++ b/test/test_websocket.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:test/test.dart';
+
 import 'package:sip_ua/src/event_manager/events.dart';
 import 'package:sip_ua/src/socket_transport.dart';
 import 'package:sip_ua/src/transports/socket_interface.dart';
 import 'package:sip_ua/src/transports/web_socket.dart';
-import 'package:test/test.dart';
 
 List<void Function()> testFunctions = <void Function()>[
   () => test(' WebSocket: EchoTest', () async {