COMMIT 7/7impl/change_command_request_inheritance_structure

85 files changed, 504 insertions, 497 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h
index b40709e6fe..51fbcee70b 100644
--- a/src/components/application_manager/include/application_manager/commands/command_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_impl.h
@@ -78,58 +78,58 @@ class CommandImpl : public Command {
   /**
    * @brief Checks command permissions according to policy table
    */
-   bool CheckPermissions() OVERRIDE;
+  bool CheckPermissions() OVERRIDE;
 
   /**
    * @brief Init required by command resources
    **/
-   bool Init() OVERRIDE;
+  bool Init() OVERRIDE;
 
   /**
    * @brief Cleanup all resources used by command
    **/
-   bool CleanUp() OVERRIDE;
+  bool CleanUp() OVERRIDE;
 
   /**
    * @brief Execute corresponding command by calling the action on reciever
    **/
-   void Run() OVERRIDE;
+  void Run() OVERRIDE;
   /**
    * @brief Retrieves request default timeout.
    * If request has a custom timeout, request_timeout_ should be reassign to it
    *
    * @return Request default timeout
    */
-   uint32_t default_timeout() const OVERRIDE;
+  uint32_t default_timeout() const OVERRIDE;
 
   /*
    * @brief Retrieves correlation ID
    */
-   uint32_t correlation_id() const OVERRIDE;
+  uint32_t correlation_id() const OVERRIDE;
 
   /*
    * @brief Retrieves connection key
    */
-   uint32_t connection_key() const OVERRIDE;
+  uint32_t connection_key() const OVERRIDE;
 
   /*
    * @brief Retrieves request ID
    */
-   int32_t function_id() const OVERRIDE;
+  int32_t function_id() const OVERRIDE;
 
   /*
    * @brief Retrieves Window ID
    */
-   WindowID window_id() const OVERRIDE;
+  WindowID window_id() const OVERRIDE;
 
   /*
    * @brief Function is called by RequestController when request execution time
    * has exceed it's limit
    *
    */
-   void HandleTimeOut() OVERRIDE;
+  void HandleTimeOut() OVERRIDE;
 
-   void OnUpdateTimeOut() OVERRIDE;
+  void OnUpdateTimeOut() OVERRIDE;
 
   /**
    * @brief AllowedToTerminate tells request Controller if it can terminate this
@@ -139,13 +139,13 @@ class CommandImpl : public Command {
    * false
    * @return allowed_to_terminate_ value
    */
-   bool AllowedToTerminate() OVERRIDE;
+  bool AllowedToTerminate() OVERRIDE;
 
   /**
    * @brief SetAllowedToTerminate set up allowed to terminate flag.
    * If true, request controller will terminate request on response
    */
-   void SetAllowedToTerminate(const bool allowed) OVERRIDE;
+  void SetAllowedToTerminate(const bool allowed) OVERRIDE;
 
   // members
   static const int32_t hmi_protocol_type_;
diff --git a/src/components/application_manager/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
index 6311e35816..58b40f3c9b 100644
--- a/src/components/application_manager/include/application_manager/commands/command_request_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
@@ -33,11 +33,11 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_REQUEST_IMPL_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_REQUEST_IMPL_H_
 
+#include "application_manager/application_manager.h"
 #include "application_manager/commands/command_impl.h"
 #include "application_manager/event_engine/event_observer.h"
-#include "application_manager/application_manager.h"
-#include "application_manager/smart_object_keys.h"
 #include "application_manager/hmi_interfaces.h"
+#include "application_manager/smart_object_keys.h"
 
 namespace application_manager {
 namespace commands {
@@ -48,7 +48,12 @@ namespace commands {
 class CommandRequestImpl : public CommandImpl,
                            public event_engine::EventObserver {
  public:
-  enum RequestState { kAwaitingHMIResponse = 0, kTimedOut, kHandlingResponse, kCompleted };
+  enum RequestState {
+    kAwaitingHMIResponse = 0,
+    kTimedOut,
+    kHandlingResponse,
+    kCompleted
+  };
 
   /**
    * @brief CommandRequestImpl class constructor
@@ -97,9 +102,9 @@ class CommandRequestImpl : public CommandImpl,
 
   virtual void on_event(const event_engine::MobileEvent& event);
 
-   /**
-    * @brief Retrieves correlation ID
-    */
+  /**
+   * @brief Retrieves correlation ID
+   */
   uint32_t correlation_id() const OVERRIDE;
 
   void SendProviderRequest(
@@ -112,9 +117,9 @@ class CommandRequestImpl : public CommandImpl,
                          smart_objects::SmartObjectSPtr msg,
                          bool use_events = false);
 
-   /*
-    * * @brief Retrieves connection key
-    */
+  /*
+   * * @brief Retrieves connection key
+   */
   uint32_t connection_key() const OVERRIDE;
 
   /**
@@ -160,7 +165,6 @@ class CommandRequestImpl : public CommandImpl,
    */
   virtual void OnTimeOut();
 
-
   /*
    * @brief Algorithm of handling on_event
    * @param Event The received event
@@ -176,29 +180,28 @@ class CommandRequestImpl : public CommandImpl,
   void OnHMIMessageSent() OVERRIDE;
 #endif  // __QNX__
 
-
-/*
- * @brief AllowedToTerminate tells request Controller if it can terminate this
- * request by response.
- * By default, RequestCtrl should terminate all requests by their responses.
- *  If request need to terminate itself, it should override this function false
- * @return allowed_to_terminate_ value
- */
+  /*
+   * @brief AllowedToTerminate tells request Controller if it can terminate this
+   * request by response.
+   * By default, RequestCtrl should terminate all requests by their responses.
+   *  If request need to terminate itself, it should override this function
+   * false
+   * @return allowed_to_terminate_ value
+   */
   bool AllowedToTerminate() OVERRIDE;
 
-
-/*
- * @brief SetAllowedToTerminate set up allowed to terminate flag.
- * If true, request controller will terminate request on response
- */
+  /*
+   * @brief SetAllowedToTerminate set up allowed to terminate flag.
+   * If true, request controller will terminate request on response
+   */
   void SetAllowedToTerminate(const bool allowed) OVERRIDE;
 
-/*
- * @brief Check syntax of string from mobile
- * @param str - string that need to be checked
- * @param allow_empty_string if true methods allow empty sting
- * @return true if success otherwise return false
- */
+  /*
+   * @brief Check syntax of string from mobile
+   * @param str - string that need to be checked
+   * @param allow_empty_string if true methods allow empty sting
+   * @return true if success otherwise return false
+   */
   virtual bool CheckSyntax(const std::string& str,
                            bool allow_empty_line = false);
 
@@ -234,30 +237,25 @@ class CommandRequestImpl : public CommandImpl,
    */
   void EndAwaitForInterface(const HmiInterfaces::InterfaceID& interface_id);
 
-
-/*
- * @brief Checks if there some not delivered hmi responses exist
- * @return true if pending responses exist, otherwise - false
- */
+  /*
+   * @brief Checks if there some not delivered hmi responses exist
+   * @return true if pending responses exist, otherwise - false
+   */
   bool IsPendingResponseExist() const;
 
+  /*
+   * @brief Parses mobile message and replaces mobile app id with HMI app id
+   * @param message Message to replace its ids
+   * @return True if replacement succeeded, otherwise - false
+   */
+  bool ReplaceMobileWithHMIAppId(smart_objects::SmartObject& message) OVERRIDE;
 
-
-/*
- * @brief Parses mobile message and replaces mobile app id with HMI app id
- * @param message Message to replace its ids
- * @return True if replacement succeeded, otherwise - false
- */
-  bool ReplaceMobileWithHMIAppId(
-      smart_objects::SmartObject& message) OVERRIDE;
-
-/*
- * @brief Parses message from HMI and replaces HMI app id with mobile app id
- * @param message Message to replace its ids
- * @return True if replacement succeeded, otherwise - false
- */
-  bool ReplaceHMIWithMobileAppId(
-      smart_objects::SmartObject& message) OVERRIDE;
+  /*
+   * @brief Parses message from HMI and replaces HMI app id with mobile app id
+   * @param message Message to replace its ids
+   * @return True if replacement succeeded, otherwise - false
+   */
+  bool ReplaceHMIWithMobileAppId(smart_objects::SmartObject& message) OVERRIDE;
 
   RequestState current_state_;
 
@@ -268,25 +266,24 @@ class CommandRequestImpl : public CommandImpl,
   std::set<HmiInterfaces::InterfaceID> awaiting_response_interfaces_;
   mutable sync_primitives::Lock awaiting_response_interfaces_lock_;
 
-
-/*
- * @brief Returns current state of request
- * @return current request state. E.g. kAwaitingResponse, kTimedOut,
- * kResponded
- */
+  /*
+   * @brief Returns current state of request
+   * @return current request state. E.g. kAwaitingResponse, kTimedOut,
+   * kResponded
+   */
   virtual RequestState current_state() const;
 
-/*
- * @brief Sets current state of request
- * @param request state to set. E.g. kAwaitingResponse, kTimedOut,
- * kResponded
- */
+  /*
+   * @brief Sets current state of request
+   * @param request state to set. E.g. kAwaitingResponse, kTimedOut,
+   * kResponded
+   */
   virtual void set_current_state(const RequestState state);
 
-/*
- * @brief This lock is used to guarantee thread safe access to request state
- */
- std::shared_ptr<sync_primitives::RecursiveLock> state_lock_;
+  /*
+   * @brief This lock is used to guarantee thread safe access to request state
+   */
+  std::shared_ptr<sync_primitives::RecursiveLock> state_lock_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CommandRequestImpl);
diff --git a/src/components/application_manager/include/application_manager/commands/request_from_mobile_impl.h b/src/components/application_manager/include/application_manager/commands/request_from_mobile_impl.h
index b981429c9b..726077d837 100644
--- a/src/components/application_manager/include/application_manager/commands/request_from_mobile_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/request_from_mobile_impl.h
@@ -34,10 +34,10 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_FROM_MOBILE_IMPL_H_
 
 #include "application_manager/commands/command_request_impl.h"
-#include "interfaces/MOBILE_API.h"
 #include "interfaces/HMI_API.h"
-#include "utils/lock.h"
+#include "interfaces/MOBILE_API.h"
 #include "smart_objects/smart_object.h"
+#include "utils/lock.h"
 
 namespace application_manager {
 namespace commands {
@@ -103,10 +103,10 @@ class RequestFromMobileImpl : public CommandRequestImpl {
   enum HashUpdateMode { kSkipHashUpdate, kDoHashUpdate };
 
   RequestFromMobileImpl(const MessageSharedPtr& message,
-                    ApplicationManager& application_manager,
-                    rpc_service::RPCService& rpc_service,
-                    HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handler);
+                        ApplicationManager& application_manager,
+                        rpc_service::RPCService& rpc_service,
+                        HMICapabilities& hmi_capabilities,
+                        policy::PolicyHandlerInterface& policy_handler);
 
   /**
    * @brief RequestFromMobileImpl class destructor
@@ -169,8 +169,10 @@ class RequestFromMobileImpl : public CommandRequestImpl {
    * @param function_id HMI request ID
    * @param msg_params HMI request msg params
    */
-  void CreateHMINotification(const hmi_apis::FunctionID::eType& function_id,
-                             const ns_smart_device_link::ns_smart_objects::SmartObject& msg_params) const;
+  void CreateHMINotification(
+      const hmi_apis::FunctionID::eType& function_id,
+      const ns_smart_device_link::ns_smart_objects::SmartObject& msg_params)
+      const;
 
   /**
    * @brief Converts HMI result code to Mobile result code
@@ -284,7 +286,7 @@ class RequestFromMobileImpl : public CommandRequestImpl {
   const CommandParametersPermissions& parameters_permissions() const;
 
   /**
-  * @brief This set stores all the interfaces which are awaited by SDL to
+   * @brief This set stores all the interfaces which are awaited by SDL to
    * return a response on some request
    */
   std::set<HmiInterfaces::InterfaceID> awaiting_response_interfaces_;
@@ -323,10 +325,10 @@ class RequestFromMobileImpl : public CommandRequestImpl {
       const hmi_apis::FunctionID::eType& function_id);
 
   /**
-    * @brief UpdateHash updates hash field for application and sends
-    * OnHashChanged notification to mobile side in case of approriate hash mode
-    * is set
-    */
+   * @brief UpdateHash updates hash field for application and sends
+   * OnHashChanged notification to mobile side in case of approriate hash mode
+   * is set
+   */
   void UpdateHash();
 
   /**
diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h
index ae9891db44..a477cd62e6 100644
--- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h
+++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher.h
@@ -78,13 +78,13 @@ class EventDispatcher {
   virtual void remove_observer(EventObserver& observer) = 0;
 
   /*
-  * @brief Unsubscribes the observer from specific event
-  *
-  * @param event_id    The event ID to subscribe for
-  * @param hmi_correlation_id  The event HMI correlation ID
-  */
+   * @brief Unsubscribes the observer from specific event
+   *
+   * @param event_id    The event ID to subscribe for
+   * @param hmi_correlation_id  The event HMI correlation ID
+   */
   virtual void remove_observer(const Event::EventID& event_id,
-                                 const int32_t hmi_correlation_id) = 0;
+                               const int32_t hmi_correlation_id) = 0;
 
   // Mobile Events
 
diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h
index e3fe701e1d..ffe659a07c 100644
--- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h
+++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h
@@ -84,8 +84,7 @@ class EventDispatcherImpl : public EventDispatcher {
   void raise_event(const Event& event) OVERRIDE;
 
   void remove_observer(const Event::EventID& event_id,
-      const int32_t hmi_correlation_id) OVERRIDE;
-
+                       const int32_t hmi_correlation_id) OVERRIDE;
 
   /*
    * @brief Subscribe the observer to event
diff --git a/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h b/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h
index c1eb40e211..3c55f1a1cd 100644
--- a/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h
+++ b/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h
@@ -47,7 +47,8 @@ class PolicyEventObserver
       policy::PolicyHandlerInterface* const policy_handler,
       application_manager::event_engine::EventDispatcher& event_dispatcher);
   void set_policy_handler(policy::PolicyHandlerInterface* const policy_handler);
-  void HandleOnEvent(const application_manager::event_engine::Event& event) OVERRIDE;
+  void HandleOnEvent(
+      const application_manager::event_engine::Event& event) OVERRIDE;
   void on_event(const application_manager::event_engine::MobileEvent& event);
   void subscribe_on_event(
       const application_manager::event_engine::Event::EventID& event_id,
diff --git a/src/components/application_manager/include/application_manager/state_controller_impl.h b/src/components/application_manager/include/application_manager/state_controller_impl.h
index 086eb210db..95cff4d550 100644
--- a/src/components/application_manager/include/application_manager/state_controller_impl.h
+++ b/src/components/application_manager/include/application_manager/state_controller_impl.h
@@ -415,7 +415,6 @@ class StateControllerImpl : public event_engine::EventObserver,
    */
   void ProcessSavingHMIState();
 
-
   /**
    * @brief Determines AudioStreamingState value
    * for application with HMI level specified.
diff --git a/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h b/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h
index fd89616b47..23e140ff29 100644
--- a/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h
+++ b/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h
@@ -70,7 +70,8 @@ class SystemTimeHandlerImpl : public utils::SystemTimeHandler,
    * in order to send system time query and GetSystemTimeResponse in order
    * to retrieve utc time and notify all the listeners with new time value.
    */
-  void HandleOnEvent(const application_manager::event_engine::Event& event) FINAL;
+  void HandleOnEvent(
+      const application_manager::event_engine::Event& event) FINAL;
 
   /**
    * @brief DoSystemTimeQuery sends the appropriate request to the system
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
index a87618766a..837eadd471 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
@@ -395,8 +395,8 @@ bool GetInteriorVehicleDataRequest::HasRequestExcessiveSubscription() {
           message_params::kSubscribe);
 
   if (is_subscribe_present_in_request) {
-    app_mngr::ApplicationSharedPtr app =
-        application_manager_.application(RequestFromMobileImpl::connection_key());
+    app_mngr::ApplicationSharedPtr app = application_manager_.application(
+        RequestFromMobileImpl::connection_key());
     const auto extension = RCHelpers::GetRCExtension(*app);
 
     const std::string module_type = ModuleType();
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
index 2a41b7ab1d..407252334b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
@@ -372,7 +372,8 @@ AcquireResult::eType SetInteriorVehicleDataRequest::AcquireResource(
     const app_mngr::commands::MessageSharedPtr& message) {
   LOG4CXX_AUTO_TRACE(logger_);
   const std::string module_type = ModuleType();
-  app_mngr::ApplicationSharedPtr app =application_manager_.application(RequestFromMobileImpl::connection_key());
+  app_mngr::ApplicationSharedPtr app =
+      application_manager_.application(RequestFromMobileImpl::connection_key());
 
   return resource_allocation_manager_.AcquireResource(
       module_type, ModuleId(), app->app_id());
@@ -386,7 +387,8 @@ bool SetInteriorVehicleDataRequest::IsResourceFree(
 void SetInteriorVehicleDataRequest::SetResourceState(
     const std::string& module_type, const ResourceState::eType state) {
   LOG4CXX_AUTO_TRACE(logger_);
-  app_mngr::ApplicationSharedPtr app =application_manager_.application(RequestFromMobileImpl::connection_key());
+  app_mngr::ApplicationSharedPtr app =
+      application_manager_.application(RequestFromMobileImpl::connection_key());
   resource_allocation_manager_.SetResourceState(
       module_type, ModuleId(), app->app_id(), state);
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc
index 0dbee45956..434548bca7 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc
@@ -292,8 +292,7 @@ void RCCommandRequest::ProcessConsentResult(const bool is_allowed,
 void RCCommandRequest::ProcessAskDriverMode(const std::string& module_type,
                                             const std::string& module_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  auto app =
-      application_manager_.application(connection_key());
+  auto app = application_manager_.application(connection_key());
   const std::string policy_app_id = app->policy_app_id();
   const std::string mac_address = app->mac_address();
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h
index c0e7588e77..8aa96937aa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h
@@ -76,9 +76,8 @@ class AlertRequest : public app_mngr::commands::RequestFromMobileImpl {
    **/
   virtual void Run();
 
-
- void on_event(const app_mngr::event_engine::Event& event) FINAL;
- void OnTimeOut() FINAL;
+  void on_event(const app_mngr::event_engine::Event& event) FINAL;
+  void OnTimeOut() FINAL;
 
  private:
   /*
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
index 5ccbe453d9..f1922ba571 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
@@ -36,8 +36,8 @@
 
 #include <strings.h>
 
-#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/commands/pending.h"
+#include "application_manager/commands/request_from_mobile_impl.h"
 #include "utils/custom_string.h"
 #include "utils/macro.h"
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h
index eba4b1f946..4f56a1b5f2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h
@@ -45,7 +45,8 @@ namespace commands {
 /**
  * @brief EndAudioPassThruRequest command class
  **/
-class EndAudioPassThruRequest : public app_mngr::commands::RequestFromMobileImpl {
+class EndAudioPassThruRequest
+    : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief EndAudioPassThruRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h
index 62cbfcbba8..104bf63cba 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h
@@ -63,7 +63,7 @@ class GetWayPointsRequest : public app_mngr::commands::RequestFromMobileImpl {
    * @brief Execute command
    **/
   virtual void Run() OVERRIDE;
-  
+
   void on_event(const app_mngr::event_engine::Event& event) FINAL;
 
   void OnTimeOut() FINAL;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h
index 4a178d097b..e7ee7147c4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h
@@ -34,8 +34,8 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_
 
-#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/commands/command_request_impl.h"
+#include "application_manager/commands/request_from_mobile_impl.h"
 #include "utils/macro.h"
 
 namespace sdl_rpc_plugin {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h
index 6727c49539..fc7b8e0207 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h
@@ -46,7 +46,8 @@ namespace commands {
 /**
  * @brief scrollable message request command class
  **/
-class ScrollableMessageRequest : public app_mngr::commands::RequestFromMobileImpl {
+class ScrollableMessageRequest
+    : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief ScrollableMessageRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
index 2240c9647f..5e99e74991 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
@@ -34,7 +34,6 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_
 
-
 #include "application_manager/commands/request_from_mobile_impl.h"
 #include "utils/macro.h"
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h
index 27995136b9..0e0105c880 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h
@@ -45,7 +45,8 @@ namespace commands {
 /**
  * @brief SetDisplayLayoutRequest command class
  **/
-class SetDisplayLayoutRequest : public app_mngr::commands::RequestFromMobileImpl {
+class SetDisplayLayoutRequest
+    : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief SetDisplayLayoutRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h
index 3d93e4b1ba..692cf4b137 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h
@@ -46,7 +46,8 @@ namespace commands {
 /**
  * @brief ShowConstantTBTRequest command class
  **/
-class ShowConstantTBTRequest : public app_mngr::commands::RequestFromMobileImpl{
+class ShowConstantTBTRequest
+    : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief ShowConstantTBTRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h
index 1c70ef581a..f9cf401c7c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h
@@ -45,7 +45,7 @@ namespace commands {
 /**
  * @brief slider request command class
  **/
-class SliderRequest : public app_mngr::commands::RequestFromMobileImpl { 
+class SliderRequest : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * \brief SliderRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h
index 48431b6ab9..8a99a3a8c1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h
@@ -46,7 +46,8 @@ namespace commands {
 /**
  * @brief SubscribeButtonRequest command class
  **/
-class SubscribeButtonRequest : public app_mngr::commands::RequestFromMobileImpl {
+class SubscribeButtonRequest
+    : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief SubscribeButtonRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h
index c13ec18305..6b52878e3a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h
@@ -33,7 +33,6 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_
 
-
 #include "application_manager/commands/request_from_mobile_impl.h"
 
 namespace sdl_rpc_plugin {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h
index 97c96bc443..beb17a3bff 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h
@@ -35,8 +35,8 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_REQUEST_H_
 
 #include <string>
-#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/event_engine/event.h"
 #include "smart_objects/smart_object.h"
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h
index ea9c9ab9c9..90d0c24b88 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h
@@ -58,10 +58,10 @@ class UnregisterAppInterfaceRequest
       app_mngr::HMICapabilities& hmi_capabilities,
       policy::PolicyHandlerInterface& policy_handler)
       : RequestFromMobileImpl(message,
-                           application_manager,
-                           rpc_service,
-                           hmi_capabilities,
-                           policy_handler) {}
+                              application_manager,
+                              rpc_service,
+                              hmi_capabilities,
+                              policy_handler) {}
 
   /**
    * \brief UnregisterAppInterfaceRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h
index ea526c5ee6..0b01955bb6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h
@@ -45,7 +45,8 @@ namespace commands {
 /**
  * @brief UnsubscribeButtonRequest command class
  **/
-class UnsubscribeButtonRequest : public app_mngr::commands::RequestFromMobileImpl {
+class UnsubscribeButtonRequest
+    : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief UnsubscribeButtonRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h
index 69f069d852..29bc269938 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h
@@ -46,7 +46,7 @@ namespace commands {
 /**
  * @brief UpdateTurnListRequest command class
  **/
-class UpdateTurnListRequest : public app_mngr::commands::RequestFromMobileImpl { 
+class UpdateTurnListRequest : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief UpdateTurnListRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc
index c7be69dd57..4f8c7fe0f1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc
@@ -76,7 +76,7 @@ void ActivateAppRequest::Run() {
 void ActivateAppRequest::OnTimeOut() {
   LOG4CXX_AUTO_TRACE(logger_);
   application_manager_.state_controller().OnTimeOutActivateAppRequest(
-    RequestToHMI::application_id());
+      RequestToHMI::application_id());
 }
 
 }  // namespace commands
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 d3c21a1161..9bfb242545 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
@@ -48,8 +48,7 @@ RCIsReadyRequest::RCIsReadyRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle)
-     {}
+                   policy_handle) {}
 
 RCIsReadyRequest::~RCIsReadyRequest() {}
 
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 db7428fd16..2ff1b39067 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
@@ -49,8 +49,7 @@ TTSIsReadyRequest::TTSIsReadyRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handler)
- {}
+                   policy_handler) {}
 
 TTSIsReadyRequest::~TTSIsReadyRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc
index b5744f813f..60103ded9e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc
@@ -51,7 +51,7 @@ UpdateDeviceListRequest::UpdateDeviceListRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle){}
+                   policy_handle) {}
 
 UpdateDeviceListRequest::~UpdateDeviceListRequest() {}
 
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 6b1e3f7f8b..20cc80ab53 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
@@ -48,7 +48,7 @@ VRIsReadyRequest::VRIsReadyRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle){}
+                   policy_handle) {}
 
 VRIsReadyRequest::~VRIsReadyRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc
index 179fff8653..595c6c4842 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc
@@ -54,11 +54,11 @@ AddCommandRequest::AddCommandRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
-    , vr_result_(hmi_apis::Common_Result::INVALID_ENUM)  
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
+    , vr_result_(hmi_apis::Common_Result::INVALID_ENUM)
     , ui_is_sent_(false)
     , vr_is_sent_(false) {}
 
@@ -601,7 +601,8 @@ void AddCommandRequest::RemoveCommand() {
 
   app->RemoveCommand(cmd_id);
 
-  if (BothSend() && !(IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_UI) || IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_VR))) {
+  if (BothSend() && !(IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_UI) ||
+                      IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_VR))) {
     // in case we have send bth UI and VR and no one respond
     // we have nothing to remove from HMI so no DeleteCommand expected
     return;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc
index 27287b49d6..b567b692f4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc
@@ -49,10 +49,10 @@ AddSubMenuRequest::AddSubMenuRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 AddSubMenuRequest::~AddSubMenuRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc
index f5c7565aa2..caaa46ccde 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc
@@ -44,15 +44,14 @@ AlertManeuverRequest::AlertManeuverRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , tts_speak_result_code_(hmi_apis::Common_Result::INVALID_ENUM)
-    , navi_alert_maneuver_result_code_(hmi_apis::Common_Result::INVALID_ENUM) 
+    , navi_alert_maneuver_result_code_(hmi_apis::Common_Result::INVALID_ENUM)
     , navi_alert_maneuver_is_sent_(false)
     , tts_speak_is_sent_(false) {
-
   subscribe_on_event(hmi_apis::FunctionID::TTS_OnResetTimeout);
 }
 
@@ -156,140 +155,141 @@ void AlertManeuverRequest::Run() {
       SendHMIRequest(hmi_apis::FunctionID::TTS_Speak, &msg_params, true);
       tts_speak_is_sent_ = true;
     }
-}
+  }
 
-void AlertManeuverRequest::on_event(const event_engine::Event& event) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  const smart_objects::SmartObject& message = event.smart_object();
-  hmi_apis::FunctionID::eType event_id = event.id();
-  switch (event_id) {
-    case hmi_apis::FunctionID::Navigation_AlertManeuver: {
-      LOG4CXX_INFO(logger_, "Received Navigation_AlertManeuver event");
-      EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_Navigation);
-      pending_requests_.Remove(event_id);
-      navi_alert_maneuver_result_code_ =
-          static_cast<hmi_apis::Common_Result::eType>(
-              message[strings::params][hmi_response::code].asInt());
-      GetInfo(message, info_navi_);
-      break;
-    }
-    case hmi_apis::FunctionID::TTS_Speak: {
-      LOG4CXX_INFO(logger_, "Received TTS_Speak event");
-      EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_TTS);
-      pending_requests_.Remove(event_id);
-      tts_speak_result_code_ = static_cast<hmi_apis::Common_Result::eType>(
-          message[strings::params][hmi_response::code].asInt());
-      GetInfo(message, info_tts_);
-      break;
-    }
-    case hmi_apis::FunctionID::TTS_OnResetTimeout: {
-      LOG4CXX_INFO(logger_, "Received TTS_OnResetTimeout event");
+  void AlertManeuverRequest::on_event(const event_engine::Event& event) {
+    LOG4CXX_AUTO_TRACE(logger_);
+    const smart_objects::SmartObject& message = event.smart_object();
+    hmi_apis::FunctionID::eType event_id = event.id();
+    switch (event_id) {
+      case hmi_apis::FunctionID::Navigation_AlertManeuver: {
+        LOG4CXX_INFO(logger_, "Received Navigation_AlertManeuver event");
+        EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_Navigation);
+        pending_requests_.Remove(event_id);
+        navi_alert_maneuver_result_code_ =
+            static_cast<hmi_apis::Common_Result::eType>(
+                message[strings::params][hmi_response::code].asInt());
+        GetInfo(message, info_navi_);
+        break;
+      }
+      case hmi_apis::FunctionID::TTS_Speak: {
+        LOG4CXX_INFO(logger_, "Received TTS_Speak event");
+        EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_TTS);
+        pending_requests_.Remove(event_id);
+        tts_speak_result_code_ = static_cast<hmi_apis::Common_Result::eType>(
+            message[strings::params][hmi_response::code].asInt());
+        GetInfo(message, info_tts_);
+        break;
+      }
+      case hmi_apis::FunctionID::TTS_OnResetTimeout: {
+        LOG4CXX_INFO(logger_, "Received TTS_OnResetTimeout event");
 
-      application_manager_.updateRequestTimeout(
-          connection_key(), correlation_id(), default_timeout());
-      break;
+        application_manager_.updateRequestTimeout(
+            connection_key(), correlation_id(), default_timeout());
+        break;
+      }
+      default: {
+        LOG4CXX_ERROR(logger_, "Received unknown event" << event.id());
+        SendResponse(
+            false, mobile_apis::Result::INVALID_ENUM, "Received unknown event");
+        return;
+      }
     }
-    default: {
-      LOG4CXX_ERROR(logger_, "Received unknown event" << event.id());
-      SendResponse(
-          false, mobile_apis::Result::INVALID_ENUM, "Received unknown event");
+
+    if (IsPendingResponseExist()) {
+      LOG4CXX_DEBUG(logger_, "Command still wating for HMI response");
       return;
     }
-  }
-
-  if (IsPendingResponseExist()) {
-    LOG4CXX_DEBUG(logger_, "Command still wating for HMI response");
-    return;
-  }
 
-  std::string return_info;
-  mobile_apis::Result::eType result_code;
-  const bool result = PrepareResponseParameters(result_code, return_info);
-  bool must_be_empty_info = false;
-  if (return_info.find("\n") != std::string::npos ||
-      return_info.find("\t") != std::string::npos) {
-    must_be_empty_info = true;
+    std::string return_info;
+    mobile_apis::Result::eType result_code;
+    const bool result = PrepareResponseParameters(result_code, return_info);
+    bool must_be_empty_info = false;
+    if (return_info.find("\n") != std::string::npos ||
+        return_info.find("\t") != std::string::npos) {
+      must_be_empty_info = true;
+    }
+    SendResponse(result,
+                 result_code,
+                 (must_be_empty_info) ? NULL : return_info.c_str(),
+                 &(message[strings::msg_params]));
   }
-  SendResponse(result,
-               result_code,
-               (must_be_empty_info) ? NULL : return_info.c_str(),
-               &(message[strings::msg_params]));
-}
 
-bool AlertManeuverRequest::PrepareResponseParameters(
-    mobile_apis::Result::eType& result_code, std::string& return_info) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  using namespace helpers;
-
-  app_mngr::commands::ResponseInfo navigation_alert_info(
-      navi_alert_maneuver_result_code_,
-      HmiInterfaces::HMI_INTERFACE_Navigation,
-      application_manager_);
-
-  app_mngr::commands::ResponseInfo tts_alert_info(
-      tts_speak_result_code_,
-      HmiInterfaces::HMI_INTERFACE_TTS,
-      application_manager_);
-  const bool result =
-      PrepareResultForMobileResponse(navigation_alert_info, tts_alert_info);
-
-  if (result && (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE ==
-                     tts_speak_result_code_ &&
-                 (HmiInterfaces::STATE_AVAILABLE ==
-                  application_manager_.hmi_interfaces().GetInterfaceState(
-                      HmiInterfaces::HMI_INTERFACE_TTS)))) {
-    result_code = mobile_apis::Result::WARNINGS;
-    return_info = std::string("Unsupported phoneme type sent in a prompt");
+  bool AlertManeuverRequest::PrepareResponseParameters(
+      mobile_apis::Result::eType & result_code, std::string & return_info) {
+    LOG4CXX_AUTO_TRACE(logger_);
+    using namespace helpers;
+
+    app_mngr::commands::ResponseInfo navigation_alert_info(
+        navi_alert_maneuver_result_code_,
+        HmiInterfaces::HMI_INTERFACE_Navigation,
+        application_manager_);
+
+    app_mngr::commands::ResponseInfo tts_alert_info(
+        tts_speak_result_code_,
+        HmiInterfaces::HMI_INTERFACE_TTS,
+        application_manager_);
+    const bool result =
+        PrepareResultForMobileResponse(navigation_alert_info, tts_alert_info);
+
+    if (result && (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE ==
+                       tts_speak_result_code_ &&
+                   (HmiInterfaces::STATE_AVAILABLE ==
+                    application_manager_.hmi_interfaces().GetInterfaceState(
+                        HmiInterfaces::HMI_INTERFACE_TTS)))) {
+      result_code = mobile_apis::Result::WARNINGS;
+      return_info = std::string("Unsupported phoneme type sent in a prompt");
+      return result;
+    }
+    result_code =
+        PrepareResultCodeForResponse(navigation_alert_info, tts_alert_info);
+    return_info = app_mngr::commands::MergeInfos(
+        navigation_alert_info, info_navi_, tts_alert_info, info_tts_);
     return result;
   }
-  result_code =
-      PrepareResultCodeForResponse(navigation_alert_info, tts_alert_info);
-  return_info = app_mngr::commands::MergeInfos(
-      navigation_alert_info, info_navi_, tts_alert_info, info_tts_);
-  return result;
-}
 
-bool AlertManeuverRequest::IsWhiteSpaceExist() {
-  LOG4CXX_AUTO_TRACE(logger_);
-  using smart_objects::SmartArray;
+  bool AlertManeuverRequest::IsWhiteSpaceExist() {
+    LOG4CXX_AUTO_TRACE(logger_);
+    using smart_objects::SmartArray;
 
-  if ((*message_)[strings::msg_params].keyExists(strings::tts_chunks)) {
-    const SmartArray* tts_chunks_arr =
-        (*message_)[strings::msg_params][strings::tts_chunks].asArray();
+    if ((*message_)[strings::msg_params].keyExists(strings::tts_chunks)) {
+      const SmartArray* tts_chunks_arr =
+          (*message_)[strings::msg_params][strings::tts_chunks].asArray();
 
-    SmartArray::const_iterator it_tts_chunk = tts_chunks_arr->begin();
+      SmartArray::const_iterator it_tts_chunk = tts_chunks_arr->begin();
 
-    for (; it_tts_chunk != tts_chunks_arr->end(); ++it_tts_chunk) {
-      const char* tts_chunk_text = (*it_tts_chunk)[strings::text].asCharArray();
-      if (strlen(tts_chunk_text) && !CheckSyntax(tts_chunk_text)) {
-        LOG4CXX_ERROR(logger_, "Invalid tts_chunks syntax check failed");
-        return true;
+      for (; it_tts_chunk != tts_chunks_arr->end(); ++it_tts_chunk) {
+        const char* tts_chunk_text =
+            (*it_tts_chunk)[strings::text].asCharArray();
+        if (strlen(tts_chunk_text) && !CheckSyntax(tts_chunk_text)) {
+          LOG4CXX_ERROR(logger_, "Invalid tts_chunks syntax check failed");
+          return true;
+        }
       }
     }
-  }
-  if ((*message_)[strings::msg_params].keyExists(strings::soft_buttons)) {
-    DCHECK_OR_RETURN(
-        (*message_)[strings::msg_params][strings::soft_buttons].getType() ==
-            smart_objects::SmartType_Array,
-        true);
-    const smart_objects::SmartArray* soft_button_array =
-        (*message_)[strings::msg_params][strings::soft_buttons].asArray();
-
-    SmartArray::const_iterator it_soft_button = soft_button_array->begin();
-
-    for (; it_soft_button != soft_button_array->end(); ++it_soft_button) {
-      const char* soft_button_text =
-          (*it_soft_button)[strings::text].asCharArray();
-      if (!CheckSyntax(soft_button_text)) {
-        LOG4CXX_ERROR(logger_, "Invalid soft_buttons syntax check failed");
-        return true;
+    if ((*message_)[strings::msg_params].keyExists(strings::soft_buttons)) {
+      DCHECK_OR_RETURN(
+          (*message_)[strings::msg_params][strings::soft_buttons].getType() ==
+              smart_objects::SmartType_Array,
+          true);
+      const smart_objects::SmartArray* soft_button_array =
+          (*message_)[strings::msg_params][strings::soft_buttons].asArray();
+
+      SmartArray::const_iterator it_soft_button = soft_button_array->begin();
+
+      for (; it_soft_button != soft_button_array->end(); ++it_soft_button) {
+        const char* soft_button_text =
+            (*it_soft_button)[strings::text].asCharArray();
+        if (!CheckSyntax(soft_button_text)) {
+          LOG4CXX_ERROR(logger_, "Invalid soft_buttons syntax check failed");
+          return true;
+        }
       }
     }
-  }
 
-  return false;
-}
+    return false;
+  }
 
 }  // namespace commands
 
-}  // namespace sdl_rpc_plugin
+}  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
index 80622e3766..c105a161b9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
@@ -54,10 +54,10 @@ AlertRequest::AlertRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , awaiting_ui_alert_response_(false)
     , awaiting_tts_speak_response_(false)
     , awaiting_tts_stop_speaking_response_(false)
@@ -473,7 +473,6 @@ bool AlertRequest::IsPendingResponseExist() {
          awaiting_tts_stop_speaking_response_;
 }
 
-
 void AlertRequest::OnTimeOut() {
   LOG4CXX_AUTO_TRACE(logger_);
   if (false ==
@@ -482,11 +481,10 @@ void AlertRequest::OnTimeOut() {
     return;
   }
   LOG4CXX_INFO(logger_,
-      "Default timeout ignored. "
-      "AlertRequest with soft buttons wait timeout on HMI side");
+               "Default timeout ignored. "
+               "AlertRequest with soft buttons wait timeout on HMI side");
 }
 
-
 }  // namespace commands
 
 }  // namespace sdl_rpc_plugin
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 4fe2d774cd..14a5978cdd 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
@@ -44,7 +44,8 @@
 namespace {
 namespace custom_str = utils::custom_string;
 struct IsSameNickname {
-  IsSameNickname(const custom_str::CustomString& app_name) : app_name_(app_name) {}
+  IsSameNickname(const custom_str::CustomString& app_name)
+      : app_name_(app_name) {}
   bool operator()(const policy::StringArray::value_type& nickname) const {
     return app_name_.CompareIgnoreCase(nickname.c_str());
   }
@@ -66,10 +67,10 @@ ChangeRegistrationRequest::ChangeRegistrationRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , ui_result_(hmi_apis::Common_Result::INVALID_ENUM)
     , vr_result_(hmi_apis::Common_Result::INVALID_ENUM)
     , tts_result_(hmi_apis::Common_Result::INVALID_ENUM) {}
@@ -285,7 +286,7 @@ void ChangeRegistrationRequest::on_event(const event_engine::Event& event) {
   }
 
   ApplicationSharedPtr application =
-    application_manager_.application(connection_key());
+      application_manager_.application(connection_key());
 
   if (!application) {
     LOG4CXX_ERROR(logger_, "NULL pointer");
@@ -293,29 +294,32 @@ void ChangeRegistrationRequest::on_event(const event_engine::Event& event) {
   }
 
   if (hmi_apis::Common_Result::SUCCESS == ui_result_) {
-    application->set_ui_language(static_cast<mobile_api::Language::eType>())
-        (*message_)[strings::msg_params][strings::hmi_display_language]
-           .asInt();
+    application
+        ->set_ui_language(static_cast<mobile_api::Language::eType>())(
+            *message_)[strings::msg_params][strings::hmi_display_language]
+        .asInt();
   }
 
-
   if (hmi_apis::Common_Result::SUCCESS == vr_result_ ||
-     hmi_apis::Common_Result::SUCCESS == tts_result_) {
-    application->set_language(static_cast<mobile_api::Language::eType>())
-      (*message_)[strings::msg_params][strings::language].asInt();
+      hmi_apis::Common_Result::SUCCESS == tts_result_) {
+    application
+        ->set_language(static_cast<mobile_api::Language::eType>())(
+            *message_)[strings::msg_params][strings::language]
+        .asInt();
   }
 
   int32_t greates_result_code =
-  std::max(std::max(static_cast<int32_t>(ui_result_),
-  static_cast<int32_t>(vr_result_)),
-             static_cast<int32_t>(tts_result_));
-  const bool all_hmi_responses_success = hmi_apis::Common_Result::SUCCESS == ui_result_ &&
-       hmi_apis::Common_Result::SUCCESS == vr_result_ &&
-       hmi_apis::Common_Result::SUCCESS == tts_result_;
+      std::max(std::max(static_cast<int32_t>(ui_result_),
+                        static_cast<int32_t>(vr_result_)),
+               static_cast<int32_t>(tts_result_));
+  const bool all_hmi_responses_success =
+      hmi_apis::Common_Result::SUCCESS == ui_result_ &&
+      hmi_apis::Common_Result::SUCCESS == vr_result_ &&
+      hmi_apis::Common_Result::SUCCESS == tts_result_;
   SendResponse(all_hmi_responses_success,
-  static_cast<mobile_apis::Result::eType>(greates_result_code),
-  NULL,
-  &(message[strings::msg_params]));
+               static_cast<mobile_apis::Result::eType>(greates_result_code),
+               NULL,
+               &(message[strings::msg_params]));
 }
 
 namespace {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
index 403ff35ab5..71fd633231 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc
@@ -56,10 +56,10 @@ CreateInteractionChoiceSetRequest::CreateInteractionChoiceSetRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , choice_set_id_(0)
     , expected_chs_count_(0)
     , received_chs_count_(0)
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc
index cfdd90631d..328b871b28 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc
@@ -51,10 +51,10 @@ DeleteCommandRequest::DeleteCommandRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , ui_result_(hmi_apis::Common_Result::INVALID_ENUM)
     , vr_result_(hmi_apis::Common_Result::INVALID_ENUM) {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc
index 950ddb117d..cb930c0f3b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc
@@ -49,10 +49,10 @@ DeleteFileRequest::DeleteFileRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 DeleteFileRequest::~DeleteFileRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc
index d2bad90065..a0b045f4c1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc
@@ -50,10 +50,10 @@ DeleteInteractionChoiceSetRequest::DeleteInteractionChoiceSetRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 DeleteInteractionChoiceSetRequest::~DeleteInteractionChoiceSetRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc
index d34bc562c0..e07e563e0f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc
@@ -50,10 +50,10 @@ DeleteSubMenuRequest::DeleteSubMenuRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 DeleteSubMenuRequest::~DeleteSubMenuRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc
index d2ad397de5..646fed0b54 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc
@@ -48,10 +48,10 @@ DialNumberRequest::DialNumberRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 DialNumberRequest::~DialNumberRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc
index 3216d339d4..5e576a4485 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc
@@ -46,10 +46,10 @@ EndAudioPassThruRequest::EndAudioPassThruRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 EndAudioPassThruRequest::~EndAudioPassThruRequest() {}
 
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 cab14ae782..2973710ed8 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
@@ -49,10 +49,10 @@ GetSystemCapabilityRequest::GetSystemCapabilityRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 GetSystemCapabilityRequest::~GetSystemCapabilityRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc
index 7dbd16985d..db2c4a42f3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc
@@ -46,10 +46,10 @@ GetWayPointsRequest::GetWayPointsRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {
   subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc
index c66d6bf126..a3de4b3fed 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc
@@ -51,10 +51,10 @@ ListFilesRequest::ListFilesRequest(
     HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 ListFilesRequest::~ListFilesRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc
index eeb9793465..3789b67007 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc
@@ -52,10 +52,10 @@ PerformAudioPassThruRequest::PerformAudioPassThruRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , result_tts_speak_(hmi_apis::Common_Result::INVALID_ENUM)
     , result_ui_(hmi_apis::Common_Result::INVALID_ENUM) {
   subscribe_on_event(hmi_apis::FunctionID::TTS_OnResetTimeout);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
index ae40aec15c..0202afa642 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
@@ -62,10 +62,10 @@ PerformInteractionRequest::PerformInteractionRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , interaction_mode_(mobile_apis::InteractionMode::INVALID_ENUM)
     , app_pi_was_active_before_(false)
     , vr_result_code_(hmi_apis::Common_Result::INVALID_ENUM)
@@ -1042,7 +1042,8 @@ bool PerformInteractionRequest::CheckChoiceIDFromRequest(
 
 const bool PerformInteractionRequest::HasHMIResponsesToWait() const {
   LOG4CXX_AUTO_TRACE(logger_);
-  return !IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_UI) || !IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_VR);
+  return !IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_UI) ||
+         !IsInterfaceAwaited(HmiInterfaces::HMI_INTERFACE_VR);
 }
 
 void PerformInteractionRequest::SendBothModeResponse(
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 53bdb85905..a36222bdd2 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
@@ -68,10 +68,10 @@ PutFileRequest::PutFileRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , offset_(0)
     , sync_file_name_()
     , length_(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 abd3ccab67..8591ea1cfb 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
@@ -182,10 +182,10 @@ RegisterAppInterfaceRequest::RegisterAppInterfaceRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , result_code_(mobile_apis::Result::INVALID_ENUM)
     , device_handle_(0) {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
index 1dda64d5d6..4857116e98 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
@@ -51,10 +51,10 @@ ResetGlobalPropertiesRequest::ResetGlobalPropertiesRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , ui_result_(hmi_apis::Common_Result::INVALID_ENUM)
     , tts_result_(hmi_apis::Common_Result::INVALID_ENUM) {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc
index 2d1869da26..aeab1e2ec9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc
@@ -53,10 +53,10 @@ ScrollableMessageRequest::ScrollableMessageRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {
   subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc
index 4046859fa2..a1539f4b37 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc
@@ -47,10 +47,10 @@ SendHapticDataRequest::SendHapticDataRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 SendHapticDataRequest::~SendHapticDataRequest() {}
 
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 d6bce89534..9858d91ec3 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
@@ -47,10 +47,10 @@ SendLocationRequest::SendLocationRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 SendLocationRequest::~SendLocationRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc
index 3ad6085d60..66e335c14f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc
@@ -53,10 +53,10 @@ SetAppIconRequest::SetAppIconRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , is_icons_saving_enabled_(false) {
   const std::string path =
       application_manager_.get_settings().app_icons_folder();
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 159760a306..e8c1924e3e 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
@@ -48,10 +48,10 @@ SetDisplayLayoutRequest::SetDisplayLayoutRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 SetDisplayLayoutRequest::~SetDisplayLayoutRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
index d944209f32..2986586821 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
@@ -71,10 +71,10 @@ SetGlobalPropertiesRequest::SetGlobalPropertiesRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , is_rc_send_(false)
     , is_rc_received_(false)
     , ui_result_(hmi_apis::Common_Result::INVALID_ENUM)
@@ -187,7 +187,7 @@ void SetGlobalPropertiesRequest::Run() {
       SendResponse(false, mobile_apis::Result::REJECTED);
       return;
     }
-  
+
     StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
   } else {
     LOG4CXX_DEBUG(logger_, "VRHelp params does not present");
@@ -478,8 +478,9 @@ bool SetGlobalPropertiesRequest::PrepareResultForMobileResponse(
       (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == first.result_code) ||
       (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == second.result_code);
 
-  const bool final_result = RequestFromMobileImpl::CheckResult(both_info, third) ||
-                            RequestFromMobileImpl::CheckResult(third, both_info);
+  const bool final_result =
+      RequestFromMobileImpl::CheckResult(both_info, third) ||
+      RequestFromMobileImpl::CheckResult(third, both_info);
 
   return final_result;
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc
index 28ef3a45f8..40dd81390c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc
@@ -50,10 +50,10 @@ SetMediaClockRequest::SetMediaClockRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 SetMediaClockRequest::~SetMediaClockRequest() {}
 
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 b6d4c1abdb..28abf151c9 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
@@ -53,10 +53,10 @@ ShowConstantTBTRequest::ShowConstantTBTRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 ShowConstantTBTRequest::~ShowConstantTBTRequest() {}
 
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 67bfcef6fc..1b4834bf93 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
@@ -51,10 +51,10 @@ ShowRequest::ShowRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler)
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler)
     , core_result_code_(mobile_apis::Result::INVALID_ENUM)
     , current_window_id_(mobile_apis::PredefinedWindows::DEFAULT_WINDOW)
     , template_config_(smart_objects::SmartType::SmartType_Null)
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
index b91a95221a..d159cd40b0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
@@ -50,10 +50,10 @@ SliderRequest::SliderRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {
   subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc
index 5dc97acb2a..84d46c136f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc
@@ -50,10 +50,10 @@ SpeakRequest::SpeakRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {
   subscribe_on_event(hmi_apis::FunctionID::TTS_OnResetTimeout);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc
index 27b64c02ac..e3c236d333 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc
@@ -48,10 +48,10 @@ SubscribeButtonRequest::SubscribeButtonRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 SubscribeButtonRequest::~SubscribeButtonRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc
index ab0357d04a..f97a74515a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc
@@ -46,10 +46,10 @@ SubscribeWayPointsRequest::SubscribeWayPointsRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 SubscribeWayPointsRequest::~SubscribeWayPointsRequest() {}
 
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 8aaa0eab61..357a9d3746 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
@@ -440,10 +440,10 @@ SystemRequest::SystemRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 SystemRequest::~SystemRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc
index 82f6582606..5eb7f064ab 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc
@@ -50,10 +50,10 @@ UnsubscribeButtonRequest::UnsubscribeButtonRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 UnsubscribeButtonRequest::~UnsubscribeButtonRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
index f0936d264b..b310dc70e9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
@@ -46,10 +46,10 @@ UnsubscribeWayPointsRequest::UnsubscribeWayPointsRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 UnsubscribeWayPointsRequest::~UnsubscribeWayPointsRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc
index 3f9b9a4a03..b6f30dcfd0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc
@@ -55,10 +55,10 @@ UpdateTurnListRequest::UpdateTurnListRequest(
     app_mngr::HMICapabilities& hmi_capabilities,
     policy::PolicyHandlerInterface& policy_handler)
     : RequestFromMobileImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                            application_manager,
+                            rpc_service,
+                            hmi_capabilities,
+                            policy_handler) {}
 
 UpdateTurnListRequest::~UpdateTurnListRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h
index 626258c66d..2c78086cfd 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h
@@ -46,7 +46,8 @@ namespace commands {
 /**
  * @brief DiagnosticMessageRequest command class
  **/
-class DiagnosticMessageRequest : public app_mngr::commands::RequestFromMobileImpl {
+class DiagnosticMessageRequest
+    : public app_mngr::commands::RequestFromMobileImpl {
  public:
   /**
    * @brief DiagnosticMessageRequest class constructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
index 6b2d092e41..026e8e47ae 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
@@ -34,8 +34,8 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_
 
-#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/application.h"
+#include "application_manager/commands/request_from_mobile_impl.h"
 #include "utils/macro.h"
 #include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc
index 0fa3a85c04..23dac746cc 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc
@@ -48,10 +48,10 @@ DiagnosticMessageRequest::DiagnosticMessageRequest(
     const application_manager::commands::MessageSharedPtr& message,
     const VehicleInfoCommandParams& params)
     : RequestFromMobileImpl(message,
-                         params.application_manager_,
-                         params.rpc_service_,
-                         params.hmi_capabilities_,
-                         params.policy_handler_) {}
+                            params.application_manager_,
+                            params.rpc_service_,
+                            params.hmi_capabilities_,
+                            params.policy_handler_) {}
 
 DiagnosticMessageRequest::~DiagnosticMessageRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc
index a99be8e8c2..d25ff73dc5 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc
@@ -46,10 +46,10 @@ GetDTCsRequest::GetDTCsRequest(
     const application_manager::commands::MessageSharedPtr& message,
     const VehicleInfoCommandParams& params)
     : RequestFromMobileImpl(message,
-                         params.application_manager_,
-                         params.rpc_service_,
-                         params.hmi_capabilities_,
-                         params.policy_handler_) {}
+                            params.application_manager_,
+                            params.rpc_service_,
+                            params.hmi_capabilities_,
+                            params.policy_handler_) {}
 
 GetDTCsRequest::~GetDTCsRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc
index 4e6e98b6af..778137a144 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc
@@ -53,10 +53,10 @@ GetVehicleDataRequest::GetVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
     const VehicleInfoCommandParams& params)
     : RequestFromMobileImpl(message,
-                         params.application_manager_,
-                         params.rpc_service_,
-                         params.hmi_capabilities_,
-                         params.policy_handler_)
+                            params.application_manager_,
+                            params.rpc_service_,
+                            params.hmi_capabilities_,
+                            params.policy_handler_)
     , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 GetVehicleDataRequest::~GetVehicleDataRequest() {}
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc
index 48e7fb2767..d2e1f04918 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc
@@ -47,10 +47,10 @@ ReadDIDRequest::ReadDIDRequest(
     const application_manager::commands::MessageSharedPtr& message,
     const VehicleInfoCommandParams& params)
     : RequestFromMobileImpl(message,
-                         params.application_manager_,
-                         params.rpc_service_,
-                         params.hmi_capabilities_,
-                         params.policy_handler_) {}
+                            params.application_manager_,
+                            params.rpc_service_,
+                            params.hmi_capabilities_,
+                            params.policy_handler_) {}
 
 ReadDIDRequest::~ReadDIDRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
index 790501748b..dd15f819b5 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
@@ -44,10 +44,10 @@ SubscribeVehicleDataRequest::SubscribeVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
     VehicleInfoCommandParams params)
     : RequestFromMobileImpl(message,
-                         params.application_manager_,
-                         params.rpc_service_,
-                         params.hmi_capabilities_,
-                         params.policy_handler_)
+                            params.application_manager_,
+                            params.rpc_service_,
+                            params.hmi_capabilities_,
+                            params.policy_handler_)
     , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 SubscribeVehicleDataRequest::~SubscribeVehicleDataRequest() {}
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
index 7122ca62b2..7dacf11bd5 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
@@ -51,10 +51,10 @@ UnsubscribeVehicleDataRequest::UnsubscribeVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
     const VehicleInfoCommandParams& params)
     : RequestFromMobileImpl(message,
-                         params.application_manager_,
-                         params.rpc_service_,
-                         params.hmi_capabilities_,
-                         params.policy_handler_)
+                            params.application_manager_,
+                            params.rpc_service_,
+                            params.hmi_capabilities_,
+                            params.policy_handler_)
     , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 UnsubscribeVehicleDataRequest::~UnsubscribeVehicleDataRequest() {}
diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc
index 90c5aa8c07..af97e0eb12 100644
--- a/src/components/application_manager/src/commands/command_request_impl.cc
+++ b/src/components/application_manager/src/commands/command_request_impl.cc
@@ -31,8 +31,8 @@
  */
 
 #include "application_manager/commands/command_request_impl.h"
-#include "application_manager/application_impl.h"
 #include "application_manager/app_service_manager.h"
+#include "application_manager/application_impl.h"
 #include "application_manager/application_manager.h"
 
 #include "smart_objects/enum_schema_item.h"
@@ -44,9 +44,9 @@ struct AppExtensionPredicate {
   AppExtensionUID uid;
   bool operator()(const ApplicationSharedPtr app) {
     return app ? (app->QueryInterface(uid).use_count() != 0) : false;
-}
+  }
 };
-}
+}  // namespace
 
 namespace commands {
 
@@ -73,7 +73,6 @@ bool CommandRequestImpl::CheckPermissions() {
   return CommandImpl::CheckPermissions();
 }
 
-
 bool CommandRequestImpl::Init() {
   return CommandImpl::Init();
 }
@@ -226,7 +225,6 @@ bool CommandRequestImpl::CheckSyntax(const std::string& str,
   return CommandImpl::CheckSyntax(str, allow_empty_line);
 }
 
-
 bool CommandRequestImpl::ReplaceMobileWithHMIAppId(
     ns_smart_device_link::ns_smart_objects::SmartObject& message) {
   return CommandImpl::ReplaceMobileWithHMIAppId(message);
@@ -257,7 +255,6 @@ void CommandRequestImpl::HandleTimeOut() {
   OnTimeOut();
 }
 
-
 bool CommandRequestImpl::IsMobileResultSuccess(
     const mobile_apis::Result::eType result_code) {
   LOG4CXX_AUTO_TRACE(logger_);
diff --git a/src/components/application_manager/src/commands/request_from_hmi.cc b/src/components/application_manager/src/commands/request_from_hmi.cc
index 392b1842fb..8fd6eedf2e 100644
--- a/src/components/application_manager/src/commands/request_from_hmi.cc
+++ b/src/components/application_manager/src/commands/request_from_hmi.cc
@@ -52,10 +52,10 @@ RequestFromHMI::RequestFromHMI(const MessageSharedPtr& message,
                                HMICapabilities& hmi_capabilities,
                                policy::PolicyHandlerInterface& policy_handler)
     : CommandRequestImpl(message,
-                  application_manager,
-                  rpc_service,
-                  hmi_capabilities,
-                  policy_handler){
+                         application_manager,
+                         rpc_service,
+                         hmi_capabilities,
+                         policy_handler) {
   // Replace HMI app id with Mobile connection id
   ReplaceHMIWithMobileAppId(*message);
 }
diff --git a/src/components/application_manager/src/commands/request_from_mobile_impl.cc b/src/components/application_manager/src/commands/request_from_mobile_impl.cc
index 627f700973..58c5d09ef7 100644
--- a/src/components/application_manager/src/commands/request_from_mobile_impl.cc
+++ b/src/components/application_manager/src/commands/request_from_mobile_impl.cc
@@ -35,10 +35,10 @@
 #include <string>
 #include "utils/macro.h"
 
-#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/application_manager.h"
-#include "application_manager/rpc_service.h"
+#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/rpc_service.h"
 #include "smart_objects/smart_object.h"
 
 namespace application_manager {
@@ -408,9 +408,9 @@ uint32_t RequestFromMobileImpl::SendHMIRequest(
   }
 
   if (use_events) {
-    LOG4CXX_DEBUG(logger_,
-                  "subscribe_on_event " << function_id << " "
-                                        << hmi_correlation_id);
+    LOG4CXX_DEBUG(
+        logger_,
+        "subscribe_on_event " << function_id << " " << hmi_correlation_id);
     subscribe_on_event(function_id, hmi_correlation_id);
   }
   if (ProcessHMIInterfacesAvailability(hmi_correlation_id, function_id)) {
@@ -642,8 +642,7 @@ bool RequestFromMobileImpl::CheckHMICapabilities(
     return false;
   }
 
-  const auto button_capabilities_so =
-      hmi_capabilities_.button_capabilities();
+  const auto button_capabilities_so = hmi_capabilities_.button_capabilities();
   if (!button_capabilities_so) {
     LOG4CXX_ERROR(logger_, "Invalid button capabilities object");
     return false;
diff --git a/src/components/application_manager/src/commands/request_to_hmi.cc b/src/components/application_manager/src/commands/request_to_hmi.cc
index fb97c533f2..939d05c411 100644
--- a/src/components/application_manager/src/commands/request_to_hmi.cc
+++ b/src/components/application_manager/src/commands/request_to_hmi.cc
@@ -66,10 +66,10 @@ RequestToHMI::RequestToHMI(const MessageSharedPtr& message,
                            HMICapabilities& hmi_capabilities,
                            policy::PolicyHandlerInterface& policy_handler)
     : CommandRequestImpl(message,
-                  application_manager,
-                  rpc_service,
-                  hmi_capabilities,
-                  policy_handler) {}
+                         application_manager,
+                         rpc_service,
+                         hmi_capabilities,
+                         policy_handler) {}
 
 RequestToHMI::~RequestToHMI() {}
 
diff --git a/src/components/application_manager/src/policies/policy_event_observer.cc b/src/components/application_manager/src/policies/policy_event_observer.cc
index f4f9876717..c6a80e56ab 100644
--- a/src/components/application_manager/src/policies/policy_event_observer.cc
+++ b/src/components/application_manager/src/policies/policy_event_observer.cc
@@ -55,7 +55,8 @@ void PolicyEventObserver::set_policy_handler(
   policy_handler_ = policy_handler;
 }
 
-void PolicyEventObserver::HandleOnEvent(const event_engine::MobileEvent& event) {}
+void PolicyEventObserver::HandleOnEvent(
+    const event_engine::MobileEvent& event) {}
 
 void PolicyEventObserver::HandleOnEvent(const event_engine::Event& event) {
   sync_primitives::AutoLock auto_lock(policy_handler_lock_);
diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc
index 38fdfc3e91..00829a378b 100644
--- a/src/components/application_manager/src/state_controller_impl.cc
+++ b/src/components/application_manager/src/state_controller_impl.cc
@@ -706,7 +706,8 @@ void StateControllerImpl::UpdateAppWindowsStreamingState(
   }
 }
 
-void StateControllerImpl::HandleOnEvent(const event_engine::MobileEvent& event) {}
+void StateControllerImpl::HandleOnEvent(
+    const event_engine::MobileEvent& event) {}
 
 void StateControllerImpl::HandleOnEvent(const event_engine::Event& event) {
   using event_engine::Event;
@@ -1279,13 +1280,13 @@ mobile_apis::VideoStreamingState::eType StateControllerImpl::CalcVideoState(
   return state;
 }
 
-
-void StateControllerImpl::OnTimeOutActivateAppRequest(const uint32_t hmi_app_id) {
+void StateControllerImpl::OnTimeOutActivateAppRequest(
+    const uint32_t hmi_app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_INFO(logger_,
-      "TimeOut was received for"
-      "application with hmi_app_id = "
-      << hmi_app_id);
+               "TimeOut was received for"
+               "application with hmi_app_id = "
+                   << hmi_app_id);
   lock_.Acquire();
   waiting_for_activate_.erase(hmi_app_id);
   lock_.Release();
@@ -1311,12 +1312,14 @@ void StateControllerImpl::ProcessSavingHMIState() {
       }
       app = app_mngr_.application((it->app_id_));
       if (!app) {
-        LOG4CXX_WARN(logger_, "Application with appID = " << it->app_id_
-                                                 << " does not exist");
+        LOG4CXX_WARN(
+            logger_,
+            "Application with appID = " << it->app_id_ << " does not exist");
         waiting_for_applying_state_.erase(it);
         continue;
       }
-      LOG4CXX_INFO(logger_, "Application with appID = " << it->app_id_ << "exist");
+      LOG4CXX_INFO(logger_,
+                   "Application with appID = " << it->app_id_ << "exist");
       send_activate_app = it->send_activate_app_;
       state = it->state_;
       waiting_for_applying_state_.erase(it);
@@ -1325,6 +1328,4 @@ void StateControllerImpl::ProcessSavingHMIState() {
   }
 }
 
-
-
 }  // namespace application_manager
diff --git a/src/components/application_manager/test/commands/command_mobile_request_impl_test.cc b/src/components/application_manager/test/commands/command_mobile_request_impl_test.cc
index e1256077f5..7dbe2aaef8 100644
--- a/src/components/application_manager/test/commands/command_mobile_request_impl_test.cc
+++ b/src/components/application_manager/test/commands/command_mobile_request_impl_test.cc
@@ -35,9 +35,9 @@
 #include <string>
 
 #include "application_manager/commands/command_impl.h"
-#include "application_manager/commands/request_from_mobile_impl.h"
 #include "application_manager/commands/command_request_test.h"
 #include "application_manager/commands/commands_test.h"
+#include "application_manager/commands/request_from_mobile_impl.h"
 #include "gtest/gtest.h"
 #include "utils/lock.h"
 
@@ -75,8 +75,8 @@ using am::CommandParametersPermissions;
 using am::MockHmiInterfaces;
 using am::RPCParams;
 using am::commands::CommandImpl;
-using am::commands::RequestFromMobileImpl;
 using am::commands::MessageSharedPtr;
+using am::commands::RequestFromMobileImpl;
 using am::event_engine::EventObserver;
 using test::components::application_manager_test::MockAppServiceManager;
 
@@ -120,7 +120,7 @@ class RequestFromMobileImplTest
 
     void change_current_state(const RequestState state) {
       am::commands::CommandRequestImpl::set_current_state(state);
-     }
+    }
 
     CommandParametersPermissions& parameters_permissions() {
       return parameters_permissions_;
@@ -160,7 +160,6 @@ class RequestFromMobileImplTest
   std::shared_ptr<sync_primitives::Lock> app_set_lock_ptr_;
 };
 
-
 typedef RequestFromMobileImplTest::UnwrappedRequestFromMobileImpl
     URequestFromMobileImpl;
 typedef std::shared_ptr<URequestFromMobileImpl> CommandPtr;
@@ -372,7 +371,8 @@ TEST_F(RequestFromMobileImplTest,
   EXPECT_FALSE(command->CheckPermissions());
 }
 
-TEST_F(RequestFromMobileImplTest, CheckAllowedParameters_NoMsgParamsMap_SUCCESS) {
+TEST_F(RequestFromMobileImplTest,
+       CheckAllowedParameters_NoMsgParamsMap_SUCCESS) {
   MockAppPtr mock_app = CreateMockApp();
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app));
   ON_CALL(*mock_app, GetWindowIds())
@@ -540,7 +540,8 @@ TEST_F(RequestFromMobileImplTest,
 TEST_F(RequestFromMobileImplTest, HashUpdateAllowed_UpdateExpected) {
   MessageSharedPtr msg;
   CommandPtr command = CreateCommand<URequestFromMobileImpl>(msg);
-  command->SetHashUpdateMode(RequestFromMobileImpl::HashUpdateMode::kDoHashUpdate);
+  command->SetHashUpdateMode(
+      RequestFromMobileImpl::HashUpdateMode::kDoHashUpdate);
 
   MessageSharedPtr result;
 
@@ -580,7 +581,8 @@ TEST_F(RequestFromMobileImplTest, HashUpdateDisallowed_HashUpdateNotExpected) {
 TEST_F(RequestFromMobileImplTest, RequestFailed_HashUpdateNotExpected) {
   MessageSharedPtr msg;
   CommandPtr command = CreateCommand<URequestFromMobileImpl>(msg);
-  command->SetHashUpdateMode(RequestFromMobileImpl::HashUpdateMode::kDoHashUpdate);
+  command->SetHashUpdateMode(
+      RequestFromMobileImpl::HashUpdateMode::kDoHashUpdate);
 
   MessageSharedPtr result;
 
@@ -599,7 +601,8 @@ TEST_F(RequestFromMobileImplTest, RequestFailed_HashUpdateNotExpected) {
 TEST_F(RequestFromMobileImplTest, AppNotFound_HashUpdateNotExpected) {
   MessageSharedPtr msg;
   CommandPtr command = CreateCommand<URequestFromMobileImpl>(msg);
-  command->SetHashUpdateMode(RequestFromMobileImpl::HashUpdateMode::kDoHashUpdate);
+  command->SetHashUpdateMode(
+      RequestFromMobileImpl::HashUpdateMode::kDoHashUpdate);
 
   MessageSharedPtr result;
 
diff --git a/src/components/include/application_manager/state_controller.h b/src/components/include/application_manager/state_controller.h
index 2a207cb8ef..87cf328bb1 100644
--- a/src/components/include/application_manager/state_controller.h
+++ b/src/components/include/application_manager/state_controller.h
@@ -229,7 +229,6 @@ class StateController {
    * @param hmi_app_id contains HMI id of application.
    */
   virtual void OnTimeOutActivateAppRequest(const uint32_t hmi_app_id) = 0;
-
 };
 
 }  // namespace application_manager