Fix code style

111 files changed, 231 insertions, 194 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h b/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
index c1e0205e68..f3147cdb09 100644
--- a/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
@@ -52,8 +52,7 @@ class NotificationFromHMI : public CommandImpl {
   virtual bool Init();
   virtual bool CleanUp();
   virtual void Run();
-  void SendNotificationToMobile(
-      const MessageSharedPtr& message);
+  void SendNotificationToMobile(const MessageSharedPtr& message);
   void CreateHMIRequest(const hmi_apis::FunctionID::eType& function_id,
                         const smart_objects::SmartObject& msg_params) const;
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
index 9a1b851a7c..0b45d16d75 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief AddStatisticsInfoNotification command class
  **/
-class AddStatisticsInfoNotification : public app_mngr::commands::NotificationFromHMI {
+class AddStatisticsInfoNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief AddStatisticsInfoNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
index c214dc074a..bb183bb3df 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief BasicCommunicationSystemResponse command class
  **/
-class BasicCommunicationSystemResponse : public app_mngr::commands::ResponseFromHMI {
+class BasicCommunicationSystemResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief BasicCommunicationSystemResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
index c09d1e4f62..9626879f62 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief ButtonGetCapabilitiesResponse command class
  **/
-class ButtonGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI {
+class ButtonGetCapabilitiesResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief ButtonGetCapabilitiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
index 996fd6751f..39fa31681e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief MixingAudioSupportedResponse command class
  **/
-class MixingAudioSupportedResponse : public app_mngr::commands::ResponseFromHMI {
+class MixingAudioSupportedResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief MixingAudioSupportedResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
index 4a1bd37818..cd97ca7769 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief NaviSubscribeWaypoints command class
  **/
-class NaviSubscribeWayPointsResponse : public app_mngr::commands::ResponseFromHMI {
+class NaviSubscribeWayPointsResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviSubscribeWaypoints class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
index b66d6d7648..55a3983d5d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief NaviUnSubscribeWaypoints command class
  **/
-class NaviUnsubscribeWayPointsResponse : public app_mngr::commands::ResponseFromHMI {
+class NaviUnsubscribeWayPointsResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief NaviUnSubscribeWaypoints class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
index 3101132b07..e248ab4a00 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAllowSDLFunctionalityNotification command class
  **/
-class OnAllowSDLFunctionalityNotification : public app_mngr::commands::NotificationFromHMI {
+class OnAllowSDLFunctionalityNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAllowSDLFunctionalityNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
index 6beae61347..69f22c8c1a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAppActivatedNotification command class
  **/
-class OnAppActivatedNotification : public app_mngr::commands::NotificationFromHMI {
+class OnAppActivatedNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAppActivatedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
index eb4ca07ceb..4fd3c71fc1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAppDeactivatedNotification command class
  **/
-class OnAppDeactivatedNotification : public app_mngr::commands::NotificationFromHMI {
+class OnAppDeactivatedNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAppDeactivatedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
index f680596479..39f6530fbe 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAppPermissionChangedNotification command class
  **/
-class OnAppPermissionChangedNotification : public app_mngr::commands::NotificationToHMI {
+class OnAppPermissionChangedNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAppPermissionChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
index ec4432c9a4..7bd02b30f2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAppPermissionConsentNotification command class
  **/
-class OnAppPermissionConsentNotification : public app_mngr::commands::NotificationFromHMI {
+class OnAppPermissionConsentNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnAppPermissionConsentNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
index 6d719212a7..a7e9c0762c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAppRegisteredNotification command class
  **/
-class OnAppRegisteredNotification : public app_mngr::commands::NotificationToHMI {
+class OnAppRegisteredNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAppRegisteredNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
index deeb9d1c37..1f78cb344e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAppUnregisteredNotification command class
  **/
-class OnAppUnregisteredNotification : public app_mngr::commands::NotificationToHMI {
+class OnAppUnregisteredNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAppUnregisteredNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
index 3a1873b180..2c5839ac9a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnAudioDataStreamingNotification command class
  **/
-class OnAudioDataStreamingNotification : public app_mngr::commands::NotificationToHMI {
+class OnAudioDataStreamingNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnAudioDataStreamingNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
index 49104fe045..01f9384f2c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
@@ -47,7 +47,8 @@ namespace hmi {
 /**
  * @brief OnButtonEventNotification command class
  **/
-class OnButtonEventNotification : public app_mngr::commands::NotificationFromHMI {
+class OnButtonEventNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnButtonEventNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
index 2b70ec11bf..a7e8edb911 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
@@ -47,7 +47,8 @@ namespace hmi {
 /**
  * @brief OnButtonPressNotification command class
  **/
-class OnButtonPressNotification : public app_mngr::commands::NotificationFromHMI {
+class OnButtonPressNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnButtonPressNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
index b17bc65c0f..ebea803bc2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
@@ -45,7 +45,8 @@ namespace hmi {
 /**
  * @brief OnButtonSubscriptionNotification command class
  **/
-class OnButtonSubscriptionNotification : public app_mngr::commands::NotificationToHMI {
+class OnButtonSubscriptionNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnButtonSubscriptionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
index 50ca88f354..af7cdaf923 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnDeviceChosenNotification command class
  **/
-class OnDeviceChosenNotification : public app_mngr::commands::NotificationFromHMI {
+class OnDeviceChosenNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnDeviceChosenNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
index 36672580fa..b412ba8256 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnDeviceStateChangedNotification command class
  **/
-class OnDeviceStateChangedNotification : public app_mngr::commands::NotificationFromHMI {
+class OnDeviceStateChangedNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnDeviceStateChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
index dc2a601e91..2da60bd1b9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
@@ -47,7 +47,8 @@ namespace hmi {
 /**
  * @brief OnDriverDistractionNotification command class
  **/
-class OnDriverDistractionNotification : public app_mngr::commands::NotificationFromHMI {
+class OnDriverDistractionNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnDriverDistractionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
index cdf05b7472..8e64975c31 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnEventChangedNotification command class
  **/
-class OnEventChangedNotification : public app_mngr::commands::NotificationFromHMI {
+class OnEventChangedNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnEventChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
index 00a37ecd9a..010ec15422 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnExitAllApplicationsNotification command class
  **/
-class OnExitAllApplicationsNotification : public app_mngr::commands::NotificationFromHMI {
+class OnExitAllApplicationsNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnExitAllApplicationsNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
index edc924b1d0..1b5199e6e0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnExitApplicationNotification command class
  **/
-class OnExitApplicationNotification : public app_mngr::commands::NotificationFromHMI {
+class OnExitApplicationNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnExitApplicationNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
index dabbf05ecb..101136204e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnIgnitionCycleOverNotification command class
  **/
-class OnIgnitionCycleOverNotification : public app_mngr::commands::NotificationFromHMI {
+class OnIgnitionCycleOverNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnIgnitionCycleOverNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
index 0e3f0d99fd..0de86a65ab 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnNaviTBTClientStateNotification command class
  **/
-class OnNaviTBTClientStateNotification : public app_mngr::commands::NotificationFromHMI {
+class OnNaviTBTClientStateNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnNaviTBTClientStateNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
index 9cc3e3eecc..cb20b1995c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnNaviWayPointChangeNotification command class
  **/
-class OnNaviWayPointChangeNotification : public app_mngr::commands::NotificationFromHMI {
+class OnNaviWayPointChangeNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnNaviWayPointChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
index e73506f749..52c2c97350 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnRecordStartdNotification command class
  **/
-class OnRecordStartdNotification : public app_mngr::commands::NotificationToHMI {
+class OnRecordStartdNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnRecordStartdNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
index d737a6b6bd..1de853fae4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnResumeAudioSourceNotification command class
  **/
-class OnResumeAudioSourceNotification : public app_mngr::commands::NotificationToHMI {
+class OnResumeAudioSourceNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnResumeAudioSourceNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
index 2bb1006928..37bbf76be0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnSDLConsentNeededNotification command class
  **/
-class OnSDLConsentNeededNotification : public app_mngr::commands::NotificationToHMI {
+class OnSDLConsentNeededNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnSDLConsentNeededNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
index 00b755a1e5..a9f14eca9f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnSDLPersistenceCompleteNotification command class
  **/
-class OnSDLPersistenceCompleteNotification : public app_mngr::commands::NotificationToHMI {
+class OnSDLPersistenceCompleteNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnSDLPersistenceCompleteNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
index 1cf5e623a0..4bf44d3e36 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnGetStatusUpdateNotification command class
  **/
-class OnStatusUpdateNotification : public app_mngr::commands::NotificationToHMI {
+class OnStatusUpdateNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnGetStatusUpdateNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
index e2f128d94f..6983534a0b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
@@ -45,7 +45,8 @@ namespace mobile_api = mobile_apis;
 /**
  * @brief OnSystemContextNotification command class
  **/
-class OnSystemContextNotification : public app_mngr::commands::NotificationFromHMI {
+class OnSystemContextNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemContextNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
index 2484516e69..cc226aa00a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnSystemErrorNotification command class
  **/
-class OnSystemErrorNotification : public app_mngr::commands::NotificationFromHMI {
+class OnSystemErrorNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemErrorNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
index cc0c8098f9..def0400d09 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnSystemInfoChangedNotification command class
  **/
-class OnSystemInfoChangedNotification : public app_mngr::commands::NotificationFromHMI {
+class OnSystemInfoChangedNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemInfoChangedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
index eb72031878..be68c2e127 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnSystemRequestNotification command class
  **/
-class OnSystemRequestNotification : public app_mngr::commands::NotificationFromHMI {
+class OnSystemRequestNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnSystemRequestNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
index f3bd9485a5..fe8fc4e75b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnTTSLanguageChangeNotification command class
  **/
-class OnTTSLanguageChangeNotification : public app_mngr::commands::NotificationFromHMI {
+class OnTTSLanguageChangeNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSLanguageChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
index c90c3b53c1..8d67b72b09 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
@@ -45,7 +45,8 @@ namespace hmi {
 /**
  * @brief OnTTSResetTimeoutNotification command class
  **/
-class OnTTSResetTimeoutNotification : public app_mngr::commands::NotificationFromHMI {
+class OnTTSResetTimeoutNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSResetTimeoutNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
index 2d76e77e38..942725c7e0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnTTSStartedNotification command class
  **/
-class OnTTSStartedNotification : public app_mngr::commands::NotificationFromHMI {
+class OnTTSStartedNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSStartedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
index 56c5f6f35b..6187a4939d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnTTSStoppedNotification command class
  **/
-class OnTTSStoppedNotification : public app_mngr::commands::NotificationFromHMI {
+class OnTTSStoppedNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnTTSStoppedNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
index b47d2c364a..a22e91579e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
@@ -46,7 +46,8 @@ namespace hmi {
 /**
  * @brief OnUIKeyBoardInputNotification command class
  **/
-class OnUIKeyBoardInputNotification : public app_mngr::commands::NotificationFromHMI {
+class OnUIKeyBoardInputNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUIKeyBoardInputNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
index 16371691fb..520cdf857f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnUILanguageChangeNotification command class
  **/
-class OnUILanguageChangeNotification : public app_mngr::commands::NotificationFromHMI {
+class OnUILanguageChangeNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUILanguageChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
index b2ca4d4c02..72bbc310ee 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
@@ -45,7 +45,8 @@ namespace hmi {
 /**
  * @brief OnUIResetTimeoutNotification command class
  **/
-class OnUIResetTimeoutNotification : public app_mngr::commands::NotificationFromHMI {
+class OnUIResetTimeoutNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUIResetTimeoutNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
index f8c323c8ef..23f8e77a83 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
@@ -46,7 +46,8 @@ namespace hmi {
 /**
  * @brief OnUITouchEventNotification command class
  **/
-class OnUITouchEventNotification : public app_mngr::commands::NotificationFromHMI {
+class OnUITouchEventNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnUITouchEventNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
index c232838eb8..d79c91a005 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIAccPedalPositionNotification command class
  **/
-class OnVIAccPedalPositionNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIAccPedalPositionNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIAccPedalPositionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
index 03b83184cc..49d2a316ce 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIBeltStatusNotification command class
  **/
-class OnVIBeltStatusNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIBeltStatusNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIBeltStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
index 4530266ea8..2044a65390 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIBodyInformationNotification command class
  **/
-class OnVIBodyInformationNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIBodyInformationNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIBodyInformationNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
index 378b5bf6c2..0dec112800 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIDeviceStatusNotification command class
  **/
-class OnVIDeviceStatusNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIDeviceStatusNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIDeviceStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
index 449e6da414..bc00838989 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIDriverBrakingNotification command class
  **/
-class OnVIDriverBrakingNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIDriverBrakingNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIDriverBrakingNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
index 5274a8406d..62109c8322 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIEngineTorqueNotification command class
  **/
-class OnVIEngineTorqueNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIEngineTorqueNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIEngineTorqueNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
index 4d573afc9a..6f7749c805 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIExternalTemperatureNotification command class
  **/
-class OnVIExternalTemperatureNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIExternalTemperatureNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIExternalTemperatureNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
index 7ed0a90e1e..87ec90c0c9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIFuelLevelNotification command class
  **/
-class OnVIFuelLevelNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIFuelLevelNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIFuelLevelNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
index 44e5aaff16..a920a61819 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIFuelLevelStateNotification command class
  **/
-class OnVIFuelLevelStateNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIFuelLevelStateNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIFuelLevelStateNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
index 7fc5d3d209..edb74e4566 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIHeadLampStatusNotification command class
  **/
-class OnVIHeadLampStatusNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIHeadLampStatusNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIHeadLampStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
index facab07ed3..feac6a01a1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIInstantFuelConsumptionNotification command class
  **/
-class OnVIInstantFuelConsumptionNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIInstantFuelConsumptionNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIInstantFuelConsumptionNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
index 57b83b2ec9..3ce9c13ab2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIOdometerNotification command class
  **/
-class OnVIOdometerNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIOdometerNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIOdometerNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
index d32a7e18c0..2aa64ff443 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVISteeringWheelAngleNotification command class
  **/
-class OnVISteeringWheelAngleNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVISteeringWheelAngleNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVISteeringWheelAngleNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
index 034545843b..9c5f337bd2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVITirePressureNotification command class
  **/
-class OnVITirePressureNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVITirePressureNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVITirePressureNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
index 7cbf82b0e8..1f47b61c3f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
@@ -45,7 +45,8 @@ namespace commands {
  * @brief OnVIVehicleDataNotification command class
  * Sent by HMI for the periodic and non periodic vehicle data
  **/
-class OnVIVehicleDataNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIVehicleDataNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIVehicleDataNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
index 2b62d8024b..8f16e6f74a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
@@ -44,7 +44,8 @@ namespace commands {
 /**
  * @brief OnVIWiperStatusNotification command class
  **/
-class OnVIWiperStatusNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVIWiperStatusNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVIWiperStatusNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
index cc80045bd2..ebb52578b7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnVideoDataStreamingNotification command class
  **/
-class OnVideoDataStreamingNotification : public app_mngr::commands::NotificationToHMI {
+class OnVideoDataStreamingNotification
+    : public app_mngr::commands::NotificationToHMI {
  public:
   /**
    * @brief OnVideoDataStreamingNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
index 37c2c7211a..cb963cf384 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief OnVRLanguageChangeNotification command class
  **/
-class OnVRLanguageChangeNotification : public app_mngr::commands::NotificationFromHMI {
+class OnVRLanguageChangeNotification
+    : public app_mngr::commands::NotificationFromHMI {
  public:
   /**
    * @brief OnVRLanguageChangeNotification class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
index af0c6c81b0..6cc25e404f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief SDLGetListOfPermissionsResponse command class
  **/
-class SDLGetListOfPermissionsResponse : public app_mngr::commands::ResponseToHMI {
+class SDLGetListOfPermissionsResponse
+    : public app_mngr::commands::ResponseToHMI {
  public:
   /**
    * @brief SDLGetListOfPermissionsResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
index 3e0d0055b4..8458d10252 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief SDLGetUserFriendlyMessageResponse command class
  **/
-class SDLGetUserFriendlyMessageResponse : public app_mngr::commands::ResponseToHMI {
+class SDLGetUserFriendlyMessageResponse
+    : public app_mngr::commands::ResponseToHMI {
  public:
   /**
    * @brief SDLGetUserFriendlyMessageResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
index c122d39b68..82c88ac79a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief TTSChangeRegistratioResponse command class
  **/
-class TTSChangeRegistratioResponse : public app_mngr::commands::ResponseFromHMI {
+class TTSChangeRegistratioResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSChangeRegistratioResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
index 370a38881a..12a236c6f2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief TTSGetSupportedLanguagesResponse command class
  **/
-class TTSGetSupportedLanguagesResponse : public app_mngr::commands::ResponseFromHMI {
+class TTSGetSupportedLanguagesResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSGetSupportedLanguagesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
index fe789110d9..08697d40f6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief TTSSetGlobalPropertiesResponse command class
  **/
-class TTSSetGlobalPropertiesResponse : public app_mngr::commands::ResponseFromHMI {
+class TTSSetGlobalPropertiesResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSSetGlobalPropertiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
index b6d411f759..244c798707 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief UIGetSupportedLanguagesResponse command class
  **/
-class UIGetSupportedLanguagesResponse : public app_mngr::commands::ResponseFromHMI {
+class UIGetSupportedLanguagesResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIGetSupportedLanguagesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
index 92ff3e457b..10cc3db13a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief UIPerformAudioPassThruResponse command class
  **/
-class UIPerformAudioPassThruResponse : public app_mngr::commands::ResponseFromHMI {
+class UIPerformAudioPassThruResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIPerformAudioPassThruResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
index 7f93895abf..21421b398d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief UIPerformInteractionResponse command class
  **/
-class UIPerformInteractionResponse : public app_mngr::commands::ResponseFromHMI {
+class UIPerformInteractionResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UIPerformInteractionResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
index a1ff8452ea..f9e79112e9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief UISetGlobalPropertiesResponse command class
  **/
-class UISetGlobalPropertiesResponse : public app_mngr::commands::ResponseFromHMI {
+class UISetGlobalPropertiesResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISetGlobalPropertiesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
index 6b09278744..c3f9d7fd4a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief UISetMediaClockTimerResponse command class
  **/
-class UISetMediaClockTimerResponse : public app_mngr::commands::ResponseFromHMI {
+class UISetMediaClockTimerResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief UISetMediaClockTimerResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
index 1749c1e5f8..84ce33faf7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief VISubscribeVehicleDataResponse command class
  **/
-class VISubscribeVehicleDataResponse : public app_mngr::commands::ResponseFromHMI {
+class VISubscribeVehicleDataResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VISubscribeVehicleDataResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
index 47db0759f2..dc470572e6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief VIUnsubscribeVehicleDataResponse command class
  **/
-class VIUnsubscribeVehicleDataResponse : public app_mngr::commands::ResponseFromHMI {
+class VIUnsubscribeVehicleDataResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VIUnsubscribeVehicleDataResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
index d226547e00..86ee267c34 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief VRChangeRegistrationResponse command class
  **/
-class VRChangeRegistrationResponse : public app_mngr::commands::ResponseFromHMI {
+class VRChangeRegistrationResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRChangeRegistrationResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
index a92254d81d..ee047302f0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief VRGetSupportedLanguagesResponse command class
  **/
-class VRGetSupportedLanguagesResponse : public app_mngr::commands::ResponseFromHMI {
+class VRGetSupportedLanguagesResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief VRGetSupportedLanguagesResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
index 8031478f7b..54f6d18df5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
@@ -43,7 +43,8 @@ namespace commands {
 /**
  * @brief TTSPerformInteractionResponse command class
  **/
-class VRPerformInteractionResponse : public app_mngr::commands::ResponseFromHMI {
+class VRPerformInteractionResponse
+    : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
    * @brief TTSPerformInteractionResponse class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc
index 9c3f073145..8525a3febc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc
@@ -71,8 +71,7 @@ void NaviIsReadyRequest::on_event(const event_engine::Event& event) {
           message,
           HmiInterfaces::HMI_INTERFACE_Navigation);
 
-      HMICapabilities& hmi_capabilities =
-          hmi_capabilities_;
+      HMICapabilities& hmi_capabilities = hmi_capabilities_;
       hmi_capabilities.set_is_navi_cooperating(is_available);
       break;
     }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc
index 77cff7bd62..1d992a823c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc
@@ -69,8 +69,7 @@ void RCIsReadyRequest::on_event(const event_engine::Event& event) {
       const bool is_available = app_mngr::commands::ChangeInterfaceState(
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_RC);
 
-      HMICapabilities& hmi_capabilities =
-          hmi_capabilities_;
+      HMICapabilities& hmi_capabilities = hmi_capabilities_;
       hmi_capabilities.set_is_rc_cooperating(is_available);
       if (!is_available) {
         hmi_capabilities.set_rc_supported(false);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
index 7c14ef86a2..158e3db723 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
@@ -126,8 +126,7 @@ void SDLActivateAppRequest::Run() {
                       "HMIDeactivate is active");
   } else {
     const uint32_t application_id = app_id();
-    policy_handler_.OnActivateApp(application_id,
-                                                          correlation_id());
+    policy_handler_.OnActivateApp(application_id, correlation_id());
   }
 }
 
@@ -180,8 +179,7 @@ void SDLActivateAppRequest::Run() {
 
   if (app_to_activate->IsRegistered()) {
     LOG4CXX_DEBUG(logger_, "Application is registered. Activating.");
-    policy_handler_.OnActivateApp(application_id,
-                                                          correlation_id());
+    policy_handler_.OnActivateApp(application_id, correlation_id());
     return;
   }
 
@@ -250,8 +248,7 @@ void SDLActivateAppRequest::on_event(const event_engine::Event& event) {
         logger_, "Application not found by HMI app id: " << hmi_application_id);
     return;
   }
-  policy_handler_.OnActivateApp(app->app_id(),
-                                                        correlation_id());
+  policy_handler_.OnActivateApp(app->app_id(), correlation_id());
 }
 
 uint32_t SDLActivateAppRequest::hmi_app_id(
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc
index da8599ab20..169863704b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc
@@ -70,8 +70,7 @@ void TTSIsReadyRequest::on_event(const event_engine::Event& event) {
       unsubscribe_from_event(hmi_apis::FunctionID::TTS_IsReady);
       const bool is_available = app_mngr::commands::ChangeInterfaceState(
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_TTS);
-      HMICapabilities& hmi_capabilities =
-          hmi_capabilities_;
+      HMICapabilities& hmi_capabilities = hmi_capabilities_;
       hmi_capabilities.set_is_tts_cooperating(is_available);
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_TTS)) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
index 961bc8e5a4..a25b387f05 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
@@ -69,8 +69,7 @@ void UIIsReadyRequest::on_event(const event_engine::Event& event) {
       unsubscribe_from_event(hmi_apis::FunctionID::UI_IsReady);
       const bool is_available = app_mngr::commands::ChangeInterfaceState(
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_UI);
-      HMICapabilities& hmi_capabilities =
-          hmi_capabilities_;
+      HMICapabilities& hmi_capabilities = hmi_capabilities_;
       hmi_capabilities.set_is_ui_cooperating(is_available);
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_UI)) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc
index 8fc5b6a9ca..b9bf639eaa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc
@@ -73,8 +73,7 @@ void VIIsReadyRequest::on_event(const event_engine::Event& event) {
           message,
           HmiInterfaces::HMI_INTERFACE_VehicleInfo);
 
-      HMICapabilities& hmi_capabilities =
-          hmi_capabilities_;
+      HMICapabilities& hmi_capabilities = hmi_capabilities_;
       hmi_capabilities.set_is_ivi_cooperating(is_available);
       policy_handler_.OnVIIsReady();
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc
index 78a33f64e7..06e51eedc7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc
@@ -69,8 +69,7 @@ void VRIsReadyRequest::on_event(const event_engine::Event& event) {
       const bool is_available = app_mngr::commands::ChangeInterfaceState(
           application_manager_, message, HmiInterfaces::HMI_INTERFACE_VR);
 
-      HMICapabilities& hmi_capabilities =
-          hmi_capabilities_;
+      HMICapabilities& hmi_capabilities = hmi_capabilities_;
       hmi_capabilities.set_is_vr_cooperating(is_available);
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_VR)) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
index 9d1bc6467e..3574c830f9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
@@ -441,8 +441,7 @@ bool ChangeRegistrationRequest::PrepareResponseParameters(
 
 bool ChangeRegistrationRequest::IsLanguageSupportedByUI(
     const int32_t& hmi_display_lang) {
-  const HMICapabilities& hmi_capabilities =
-      hmi_capabilities_;
+  const HMICapabilities& hmi_capabilities = hmi_capabilities_;
   const smart_objects::SmartObject* ui_languages =
       hmi_capabilities.ui_supported_languages();
 
@@ -464,8 +463,7 @@ bool ChangeRegistrationRequest::IsLanguageSupportedByUI(
 
 bool ChangeRegistrationRequest::IsLanguageSupportedByVR(
     const int32_t& hmi_display_lang) {
-  const HMICapabilities& hmi_capabilities =
-      hmi_capabilities_;
+  const HMICapabilities& hmi_capabilities = hmi_capabilities_;
   const smart_objects::SmartObject* vr_languages =
       hmi_capabilities.vr_supported_languages();
 
@@ -487,8 +485,7 @@ bool ChangeRegistrationRequest::IsLanguageSupportedByVR(
 
 bool ChangeRegistrationRequest::IsLanguageSupportedByTTS(
     const int32_t& hmi_display_lang) {
-  const HMICapabilities& hmi_capabilities =
-      hmi_capabilities_;
+  const HMICapabilities& hmi_capabilities = hmi_capabilities_;
   const smart_objects::SmartObject* tts_languages =
       hmi_capabilities.tts_supported_languages();
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
index 3d95fc705f..b9de2af335 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
@@ -75,8 +75,7 @@ void GetSystemCapabilityRequest::Run() {
   response_params[strings::system_capability][strings::system_capability_type] =
       response_type;
 
-  const HMICapabilities& hmi_capabilities =
-      hmi_capabilities_;
+  const HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   switch (response_type) {
     case mobile_apis::SystemCapabilityType::NAVIGATION: {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc
index 9aa5ebfbb1..9af5d1bc03 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc
@@ -155,8 +155,7 @@ void PutFileRequest::Run() {
   // Policy table update in json format is currently to be received via PutFile
   // TODO(PV): after latest discussion has to be changed
   if (mobile_apis::FileType::JSON == file_type_) {
-    policy_handler_.ReceiveMessageFromSDK(
-        sync_file_name_, binary_data);
+    policy_handler_.ReceiveMessageFromSDK(sync_file_name_, binary_data);
   }
 
   offset_ = 0;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
index cd55a90313..998c19042e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
@@ -546,8 +546,7 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
 
   mobile_apis::Result::eType result_code = mobile_apis::Result::SUCCESS;
 
-  const HMICapabilities& hmi_capabilities =
-      hmi_capabilities_;
+  const HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
   const uint32_t key = connection_key();
   ApplicationSharedPtr application = application_manager_.application(key);
@@ -662,8 +661,7 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
 
   response_params[strings::sdl_version] =
       application_manager_.get_settings().sdl_version();
-  const std::string ccpu_version =
-      hmi_capabilities_.ccpu_version();
+  const std::string ccpu_version = hmi_capabilities_.ccpu_version();
   if (!ccpu_version.empty()) {
     response_params[strings::system_software_version] = ccpu_version;
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc
index 3318add536..d96b911ab7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc
@@ -83,8 +83,7 @@ void RegisterAppInterfaceResponse::Run() {
 void RegisterAppInterfaceResponse::SetHeartBeatTimeout(
     uint32_t connection_key, const std::string& mobile_app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  policy::PolicyHandlerInterface& policy_handler =
-      policy_handler_;
+  policy::PolicyHandlerInterface& policy_handler = policy_handler_;
   if (policy_handler.PolicyEnabled()) {
     const uint32_t timeout = policy_handler.HeartBeatTimeout(mobile_app_id);
     if (timeout > 0) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc
index 216bc8da26..f10212ecc4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc
@@ -248,8 +248,7 @@ bool SendLocationRequest::CheckHMICapabilities(
     return true;
   }
 
-  const HMICapabilities& hmi_capabilities =
-      hmi_capabilities_;
+  const HMICapabilities& hmi_capabilities = hmi_capabilities_;
   if (!hmi_capabilities.is_ui_cooperating()) {
     LOG4CXX_ERROR(logger_, "UI is not supported.");
     return false;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc
index 064ae45aff..31a643b134 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc
@@ -141,8 +141,7 @@ void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) {
       GetInfo(message, info);
       smart_objects::SmartObject msg_params = message[strings::msg_params];
       if (response_success) {
-        HMICapabilities& hmi_capabilities =
-            hmi_capabilities_;
+        HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
         // in case templates_available is empty copy from hmi capabilities
         if (msg_params.keyExists(hmi_response::display_capabilities)) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc
index 5f747d2e7c..748767648f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc
@@ -92,10 +92,8 @@ void ShowConstantTBTRequest::Run() {
   // ProcessSoftButtons checks strings on the contents incorrect character
 
   mobile_apis::Result::eType processing_result =
-      MessageHelper::ProcessSoftButtons(msg_params,
-                                        app,
-                                        policy_handler_,
-                                        application_manager_);
+      MessageHelper::ProcessSoftButtons(
+          msg_params, app, policy_handler_, application_manager_);
 
   if (mobile_apis::Result::SUCCESS != processing_result) {
     LOG4CXX_ERROR(logger_, "INVALID_DATA!");
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc
index accab0fe83..be757de210 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc
@@ -122,11 +122,11 @@ void ShowRequest::Run() {
   mobile_apis::Result::eType processing_result = mobile_apis::Result::SUCCESS;
   if (((*message_)[strings::msg_params].keyExists(strings::soft_buttons)) &&
       ((*message_)[strings::msg_params][strings::soft_buttons].length() > 0)) {
-    processing_result = MessageHelper::ProcessSoftButtons(
-        (*message_)[strings::msg_params],
-        app,
-        policy_handler_,
-        application_manager_);
+    processing_result =
+        MessageHelper::ProcessSoftButtons((*message_)[strings::msg_params],
+                                          app,
+                                          policy_handler_,
+                                          application_manager_);
   }
 
   if (mobile_apis::Result::SUCCESS != processing_result) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
index 6b0e8d011b..d580970fb1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
@@ -586,8 +586,7 @@ void SystemRequest::Run() {
       (*message_)[strings::msg_params].keyExists(strings::file_name)) {
     const std::string& file =
         (*message_)[strings::msg_params][strings::file_name].asString();
-    policy_handler_.ReceiveMessageFromSDK(file,
-                                                                  binary_data);
+    policy_handler_.ReceiveMessageFromSDK(file, binary_data);
     SendResponse(true, mobile_apis::Result::SUCCESS);
     return;
   } else if (mobile_apis::RequestType::QUERY_APPS == request_type) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
index bab91d3df5..250ca7742d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
@@ -898,7 +898,8 @@ TEST_F(HMICommandsNotificationsTest,
       CreateCommand<OnDeviceStateChangedNotification>(message);
 
   std::string device_id = "default_id";
-  EXPECT_CALL(mock_policy_handler_, RemoveDevice(_)).WillOnce(GetArg(&device_id));
+  EXPECT_CALL(mock_policy_handler_, RemoveDevice(_))
+      .WillOnce(GetArg(&device_id));
   command->Run();
   EXPECT_EQ(empty_device_id, device_id);
 }
@@ -917,7 +918,8 @@ TEST_F(HMICommandsNotificationsTest,
       CreateCommand<OnDeviceStateChangedNotification>(message);
 
   std::string device_id = "default_id";
-  EXPECT_CALL(mock_policy_handler_, RemoveDevice(_)).WillOnce(GetArg(&device_id));
+  EXPECT_CALL(mock_policy_handler_, RemoveDevice(_))
+      .WillOnce(GetArg(&device_id));
   command->Run();
   EXPECT_EQ(id, device_id);
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
index 20aec44c08..9e2cab768d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
@@ -587,7 +587,6 @@ TEST_F(AddCommandRequestTest, OnEvent_BothSend_SUCCESS) {
 }
 
 TEST_F(AddCommandRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
-
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
   utils::SharedPtr<AddCommandRequest> request_ptr =
       CreateCommand<AddCommandRequest>(msg_);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
index ba4ccfa260..fb7c952a34 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
@@ -573,7 +573,6 @@ TEST_F(AlertRequestTest, OnEvent_TTSUnsupportedResourceUiAlertSuccess_SUCCESS) {
   (*msg_)[am::strings::params][am::hmi_response::code] =
       hmi_apis::Common_Result::SUCCESS;
 
-
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_StopSpeaking)))
@@ -619,7 +618,6 @@ TEST_F(AlertRequestTest, OnEvent_TTSSuccesUiAlertInvalidEnum_SUCCESS) {
   (*msg_)[am::strings::params][am::hmi_response::code] =
       hmi_apis::Common_Result::INVALID_ENUM;
 
-
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_StopSpeaking)))
@@ -666,7 +664,6 @@ TEST_F(AlertRequestTest, DISABLED_OnEvent_TTSAbortedUiAlertNotSent_SUCCESS) {
   (*msg_)[am::strings::params][am::hmi_response::code] =
       hmi_apis::Common_Result::INVALID_ENUM;
 
-
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_StopSpeaking)))
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc
index b1851d5c76..86f4d53722 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc
@@ -263,7 +263,6 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_InvalidApp_UNSUCCESS) {
   EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(invalid_app));
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).Times(0);
 
-
   command_->Run();
 }
 
@@ -278,7 +277,6 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_VerifyImageFail_UNSUCCESS) {
       .WillRepeatedly(Return(mobile_apis::Result::INVALID_DATA));
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).Times(0);
 
-
   command_->Run();
 }
 
@@ -334,7 +332,6 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
   EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId))
       .WillOnce(Return(choice_set_id));
 
-
   EXPECT_CALL(app_mngr_, GenerateGrammarID()).Times(0);
   command_->Run();
 }
@@ -368,7 +365,6 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
   EXPECT_CALL(mock_message_helper_, VerifyImage(_, _, _))
       .WillRepeatedly(Return(mobile_apis::Result::SUCCESS));
 
-
   if ((*message_)[am::strings::msg_params][am::strings::choice_set][0]
           .keyExists(am::strings::menu_name)) {
     CreateInteractionChoiceSetRequestPtr command(
@@ -695,7 +691,6 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnTimeOut_InvalidApp_UNSUCCESS) {
 
   command_->Run();
 
-
   FillMessageFieldsItem2(message_);
   EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _)).Times(0);
   EXPECT_CALL(app_mngr_, TerminateRequest(_, _, _)).Times(2);
@@ -738,7 +733,6 @@ TEST_F(CreateInteractionChoiceSetRequestTest,
       .WillOnce(Return(choice_set_id));
   EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _));
 
-
   command_->Run();
 
   FillMessageFieldsItem2(message_);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc
index c70c384776..a3f884f309 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc
@@ -129,7 +129,6 @@ class DeleteCommandRequestTest
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey));
     ON_CALL(app_mngr_, hmi_interfaces())
         .WillByDefault(ReturnRef(hmi_interfaces_));
-
   }
 
   NiceMock<MockHmiInterfaces> hmi_interfaces_;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc
index f639bb96e8..4a1ed1f01d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc
@@ -210,7 +210,6 @@ TEST_F(DeleteInteractionChoiceSetRequestTest,
     EXPECT_CALL(*app_, UpdateHash());
   }
 
-
   DeleteInteractionChoiceSetRequestPtr command =
       CreateCommand<DeleteInteractionChoiceSetRequest>(message_);
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_dtcs_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_dtcs_request_test.cc
index 28b576628d..785610ff33 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_dtcs_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_dtcs_request_test.cc
@@ -98,7 +98,6 @@ TEST_F(GetDTCsRequestTest, Run_SUCCESS) {
   MockAppPtr app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
 
-
   EXPECT_CALL(mock_rpc_service_,
               ManageHMICommand(
                   HMIResultCodeIs(hmi_apis::FunctionID::VehicleInfo_GetDTCs)));
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc
index 6097208bf2..8887a04d86 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc
@@ -127,7 +127,6 @@ TEST_F(OnCommandNotificationTest, Run_SUCCESS) {
   EXPECT_CALL(mock_rpc_service_,
               SendMessageToMobile(CheckNotificationMessage(), _));
 
-
   command->Run();
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
index 0a874754b4..3cbd52d8b1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
@@ -215,7 +215,6 @@ class SetGlobalPropertiesRequestTest
     ON_CALL(mock_hmi_interfaces_,
             GetInterfaceState(am::HmiInterfaces::HMI_INTERFACE_UI))
         .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
-
   }
 
   void ResultCommandExpectations(MessageSharedPtr msg,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc
index 3a3c549ee0..3234271aaf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc
@@ -111,7 +111,6 @@ class SystemRequestTest
 
   void ExpectManageMobileCommandWithResultCode(
       const mobile_apis::Result::eType code) {
-
     EXPECT_CALL(
         mock_rpc_service_,
         ManageMobileCommand(MobileResultCodeIs(code),
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc
index 40ccd2ebca..464e3694c4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc
@@ -64,7 +64,7 @@ TEST_F(UnregisterAppInterfaceRequestTest, Run_AppNotRegistered_UNSUCCESS) {
 
   EXPECT_CALL(app_mngr_, application(_))
       .WillOnce(Return(ApplicationSharedPtr()));
-  
+
   EXPECT_CALL(
       mock_rpc_service_,
       ManageMobileCommand(
@@ -96,13 +96,13 @@ TEST_F(UnregisterAppInterfaceRequestTest, Run_SUCCESS) {
       .WillOnce(Return(dummy_msg));
   {
     ::testing::InSequence sequence;
-    
+
     EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(dummy_msg, _));
 
     EXPECT_CALL(app_mngr_,
                 UnregisterApplication(
                     kConnectionKey, mobile_apis::Result::SUCCESS, _, _));
-    
+
     EXPECT_CALL(mock_rpc_service_,
                 ManageMobileCommand(
                     MobileResultCodeIs(mobile_apis::Result::SUCCESS), _));
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 4df80a4e5d..b413b3d3ed 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -2814,21 +2814,20 @@ void ApplicationManagerImpl::ProcessPostponedMessages(const uint32_t app_id) {
   }
   MobileMessageQueue messages;
   app->SwapMobileMessageQueue(messages);
-  auto push_allowed_messages =
-      [this, &app](smart_objects::SmartObjectSPtr message) {
-        const std::string function_id = MessageHelper::StringifiedFunctionID(
-            static_cast<mobile_apis::FunctionID::eType>(
-                (*message)[strings::params][strings::function_id].asUInt()));
-        const RPCParams params;
-        const mobile_apis::Result::eType check_result =
-            CheckPolicyPermissions(app, function_id, params);
-        if (mobile_api::Result::SUCCESS == check_result) {
-          rpc_service_->ManageMobileCommand(message,
-                              commands::Command::SOURCE_SDL);
-        } else {
-          app->PushMobileMessage(message);
-        }
-      };
+  auto push_allowed_messages = [this, &app](
+      smart_objects::SmartObjectSPtr message) {
+    const std::string function_id = MessageHelper::StringifiedFunctionID(
+        static_cast<mobile_apis::FunctionID::eType>(
+            (*message)[strings::params][strings::function_id].asUInt()));
+    const RPCParams params;
+    const mobile_apis::Result::eType check_result =
+        CheckPolicyPermissions(app, function_id, params);
+    if (mobile_api::Result::SUCCESS == check_result) {
+      rpc_service_->ManageMobileCommand(message, commands::Command::SOURCE_SDL);
+    } else {
+      app->PushMobileMessage(message);
+    }
+  };
   std::for_each(messages.begin(), messages.end(), push_allowed_messages);
 }
 
diff --git a/src/components/application_manager/src/commands/response_from_hmi.cc b/src/components/application_manager/src/commands/response_from_hmi.cc
index 6e6761586b..123dbad828 100644
--- a/src/components/application_manager/src/commands/response_from_hmi.cc
+++ b/src/components/application_manager/src/commands/response_from_hmi.cc
@@ -38,12 +38,11 @@ namespace application_manager {
 
 namespace commands {
 
-ResponseFromHMI::ResponseFromHMI(
-    const MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+ResponseFromHMI::ResponseFromHMI(const MessageSharedPtr& message,
+                                 ApplicationManager& application_manager,
+                                 rpc_service::RPCService& rpc_service,
+                                 HMICapabilities& hmi_capabilities,
+                                 policy::PolicyHandlerInterface& policy_handle)
     : CommandImpl(message,
                   application_manager,
                   rpc_service,
@@ -72,8 +71,7 @@ bool ResponseFromHMI::CleanUp() {
 void ResponseFromHMI::Run() {}
 
 void ResponseFromHMI::SendResponseToMobile(
-    const MessageSharedPtr& message,
-    ApplicationManager& application_manager) {
+    const MessageSharedPtr& message, ApplicationManager& application_manager) {
   (*message)[strings::params][strings::message_type] = MessageType::kResponse;
 
   rpc_service_.ManageMobileCommand(message, SOURCE_SDL);
diff --git a/src/components/application_manager/src/commands/response_to_hmi.cc b/src/components/application_manager/src/commands/response_to_hmi.cc
index 7c297c56b0..01a2ec789e 100644
--- a/src/components/application_manager/src/commands/response_to_hmi.cc
+++ b/src/components/application_manager/src/commands/response_to_hmi.cc
@@ -38,12 +38,11 @@ namespace application_manager {
 
 namespace commands {
 
-ResponseToHMI::ResponseToHMI(
-    const MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+ResponseToHMI::ResponseToHMI(const MessageSharedPtr& message,
+                             ApplicationManager& application_manager,
+                             rpc_service::RPCService& rpc_service,
+                             HMICapabilities& hmi_capabilities,
+                             policy::PolicyHandlerInterface& policy_handle)
     : CommandImpl(message,
                   application_manager,
                   rpc_service,
diff --git a/src/components/application_manager/test/commands/command_request_impl_test.cc b/src/components/application_manager/test/commands/command_request_impl_test.cc
index 556d1c85d4..dc0690af91 100644
--- a/src/components/application_manager/test/commands/command_request_impl_test.cc
+++ b/src/components/application_manager/test/commands/command_request_impl_test.cc
@@ -154,7 +154,7 @@ TEST_F(CommandRequestImplTest, OnTimeOut_StateCompleted_UNSUCCESS) {
   // First -- on `onTimeOut` method call
   // Second -- on destruction;
   EXPECT_CALL(event_dispatcher_, remove_observer(_)).Times(2);
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
 
   // If `command` already done, then state should change to `kCompleted`.
@@ -176,7 +176,7 @@ TEST_F(CommandRequestImplTest, OnTimeOut_StateAwaitingHMIResponse_SUCCESS) {
   MessageSharedPtr dummy_msg(CreateMessage());
   EXPECT_CALL(mock_message_helper_, CreateNegativeResponse(_, _, _, _))
       .WillOnce(Return(dummy_msg));
-  
+
   EXPECT_CALL(
       mock_rpc_service_,
       ManageMobileCommand(dummy_msg, Command::CommandSource::SOURCE_SDL));
@@ -255,7 +255,7 @@ TEST_F(CommandRequestImplTest, CreateHMINotification_SUCCESS) {
   (*msg_params)[kTestParamsKey] = 0;
 
   MessageSharedPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -277,7 +277,7 @@ TEST_F(CommandRequestImplTest, SendHMIRequest_NoUseEvent_SUCCESS) {
   EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
       .WillRepeatedly(Return(am::HmiInterfaces::STATE_AVAILABLE));
   // Return `true` prevents call of `SendResponse` method;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_)).WillOnce(Return(true));
 
   EXPECT_EQ(kCorrelationId,
@@ -295,7 +295,7 @@ TEST_F(CommandRequestImplTest, SendHMIRequest_UseEvent_SUCCESS) {
   EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
       .WillRepeatedly(Return(am::HmiInterfaces::STATE_AVAILABLE));
   // Return `true` prevents call of `SendResponse` method;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_)).WillOnce(Return(true));
   EXPECT_CALL(event_dispatcher_, add_observer(_, _, _));
 
@@ -392,7 +392,7 @@ TEST_F(CommandRequestImplTest,
 
   EXPECT_CALL(mock_message_helper_, CreateBlockedByPoliciesResponse(_, _, _, _))
       .WillOnce(Return(smart_objects::SmartObjectSPtr()));
-  
+
   EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, _));
   EXPECT_FALSE(command->CheckPermissions());
 }
@@ -444,7 +444,7 @@ TEST_F(CommandRequestImplTest, SendResponse_TimedOut_UNSUCCESS) {
   CommandPtr command = CreateCommand<UCommandRequestImpl>();
 
   command->set_current_state(RequestState::kTimedOut);
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
 
   // Args do not affect on anything in this case;
@@ -460,7 +460,7 @@ TEST_F(CommandRequestImplTest, SendResponse_SUCCESS) {
   EXPECT_TRUE(smart_objects::SmartType_Null == (*msg).getType());
 
   MessageSharedPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -491,7 +491,7 @@ TEST_F(CommandRequestImplTest,
       kDisallowedParam1);
 
   MessageSharedPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -510,7 +510,7 @@ TEST_F(CommandRequestImplTest, HashUpdateAllowed_UpdateExpected) {
   command->SetHashUpdateMode(CommandRequestImpl::HashUpdateMode::kDoHashUpdate);
 
   MessageSharedPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -531,7 +531,7 @@ TEST_F(CommandRequestImplTest, HashUpdateDisallowed_HashUpdateNotExpected) {
       CommandRequestImpl::HashUpdateMode::kSkipHashUpdate);
 
   MessageSharedPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -550,7 +550,7 @@ TEST_F(CommandRequestImplTest, RequestFailed_HashUpdateNotExpected) {
   command->SetHashUpdateMode(CommandRequestImpl::HashUpdateMode::kDoHashUpdate);
 
   MessageSharedPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -569,7 +569,7 @@ TEST_F(CommandRequestImplTest, AppNotFound_HashUpdateNotExpected) {
   command->SetHashUpdateMode(CommandRequestImpl::HashUpdateMode::kDoHashUpdate);
 
   MessageSharedPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc
index 581f8e690d..0d6d327122 100644
--- a/src/components/application_manager/test/message_helper/message_helper_test.cc
+++ b/src/components/application_manager/test/message_helper/message_helper_test.cc
@@ -952,7 +952,7 @@ TEST_F(MessageHelperTest, SendGetListOfPermissionsResponse_SUCCESS) {
   permissions.push_back(permission);
 
   smart_objects::SmartObjectSPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -990,7 +990,7 @@ TEST_F(MessageHelperTest,
       entity_type_2, entity_id_2, entity_status_2));
 
   smart_objects::SmartObjectSPtr result;
-  
+
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index bb3f21b855..3030722615 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -1009,7 +1009,8 @@ TEST_F(PolicyHandlerTest,
                   kAppId1_,
                   mobile_api::AppInterfaceUnregisteredReason::APP_UNAUTHORIZED))
       .WillOnce(Return(message));
-  ON_CALL(app_manager_, GetRPCService()).WillByDefault(ReturnRef(mock_rpc_service_));
+  ON_CALL(app_manager_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
   EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(_, commands::Command::SOURCE_SDL));
 
@@ -1062,7 +1063,8 @@ TEST_F(PolicyHandlerTest,
                   kAppId1_,
                   mobile_api::AppInterfaceUnregisteredReason::APP_UNAUTHORIZED))
       .WillOnce(Return(message));
-  ON_CALL(app_manager_, GetRPCService()).WillByDefault(ReturnRef(mock_rpc_service_));
+  ON_CALL(app_manager_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
   EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(_, commands::Command::SOURCE_SDL));