diff --git a/cfgmgr/tunnelmgr.cpp b/cfgmgr/tunnelmgr.cpp
index 9eac7b3a5e..848b4dba6b 100644
--- a/cfgmgr/tunnelmgr.cpp
+++ b/cfgmgr/tunnelmgr.cpp
@@ -76,7 +76,6 @@ bool TunnelMgr::doIpInIpTunnelTask(const KeyOpFieldsValuesTuple & t)
     if (op == SET_COMMAND)
     {
         m_appIpInIpTunnelTable.set(TunnelName, kfvFieldsValues(t));
-
     }
     else
     {
diff --git a/orchagent/muxorch.cpp b/orchagent/muxorch.cpp
index af082b5d0a..eabb7ab396 100644
--- a/orchagent/muxorch.cpp
+++ b/orchagent/muxorch.cpp
@@ -304,7 +304,7 @@ MuxCable::MuxCable(string name, IpPrefix& srv_ip4, IpPrefix& srv_ip6, IpAddress
     mux_cb_orch_ = gDirectory.get<MuxCableOrch*>();
     mux_state_orch_ = gDirectory.get<MuxStateOrch*>();
 
-    nbr_handler_ = unique_ptr<MuxNbrHandler> (new MuxNbrHandler());
+    nbr_handler_ = std::make_unique<MuxNbrHandler> (MuxNbrHandler());
 
     state_machine_handlers_.insert(handler_pair(MUX_STATE_INIT_ACTIVE, &MuxCable::stateInitActive));
     state_machine_handlers_.insert(handler_pair(MUX_STATE_STANDBY_ACTIVE, &MuxCable::stateActive));
@@ -726,8 +726,10 @@ void MuxOrch::update(SubjectType type, void *cntx)
     }
 }
 
-MuxOrch::MuxOrch(DBConnector *db, const std::vector<std::string> &tables, TunnelDecapOrch* decapOrch, NeighOrch* neighOrch)
-          : Orch2(db, tables, request_), decap_orch_(decapOrch), neigh_orch_(neighOrch)
+MuxOrch::MuxOrch(DBConnector *db, const std::vector<std::string> &tables, TunnelDecapOrch* decapOrch, NeighOrch* neighOrch) :
+         Orch2(db, tables, request_),
+         decap_orch_(decapOrch),
+         neigh_orch_(neighOrch)
 {
     handler_map_.insert(handler_pair(CFG_MUX_CABLE_TABLE_NAME, &MuxOrch::handleMuxCfg));
     handler_map_.insert(handler_pair(CFG_PEER_SWITCH_TABLE_NAME, &MuxOrch::handlePeerSwitch));
@@ -759,8 +761,8 @@ bool MuxOrch::handleMuxCfg(const Request& request)
             return false;
         }
 
-        mux_cable_tb_[port_name] = std::unique_ptr<MuxCable>
-                                   (new MuxCable(port_name, srv_ip, srv_ip6, mux_peer_switch_));
+        mux_cable_tb_[port_name] = std::make_unique<MuxCable>
+                                   (MuxCable(port_name, srv_ip, srv_ip6, mux_peer_switch_));
 
         SWSS_LOG_NOTICE("Mux entry for port '%s' was added", port_name.c_str());
     }
@@ -864,7 +866,8 @@ bool MuxOrch::delOperation(const Request& request)
     return true;
 }
 
-MuxCableOrch::MuxCableOrch(DBConnector *db, const std::string& tableName): Orch2(db, tableName, request_)
+MuxCableOrch::MuxCableOrch(DBConnector *db, const std::string& tableName):
+              Orch2(db, tableName, request_)
 {
     mux_table_ = unique_ptr<Table>(new Table(db, APP_HW_MUX_CABLE_TABLE_NAME));
 }
diff --git a/orchagent/muxorch.h b/orchagent/muxorch.h
index 9b59401f48..2d3c15c1cd 100644
--- a/orchagent/muxorch.h
+++ b/orchagent/muxorch.h
@@ -36,32 +36,32 @@ class MuxStateOrch;
 // Mux ACL Handler for adding/removing ACLs
 class MuxAclHandler
 {
-    public:
-        MuxAclHandler(sai_object_id_t port);
-        ~MuxAclHandler(void);
+public:
+    MuxAclHandler(sai_object_id_t port);
+    ~MuxAclHandler(void);
 
-    private:
-        void createMuxAclTable(sai_object_id_t port, string strTable);
-        void createMuxAclRule(shared_ptr<AclRuleMux> rule, string strTable);
+private:
+    void createMuxAclTable(sai_object_id_t port, string strTable);
+    void createMuxAclRule(shared_ptr<AclRuleMux> rule, string strTable);
 
-        // class shared dict: ACL table name -> ACL table
-        static std::map<std::string, AclTable> acl_table_;
-        sai_object_id_t port_ = SAI_NULL_OBJECT_ID;
+    // class shared dict: ACL table name -> ACL table
+    static std::map<std::string, AclTable> acl_table_;
+    sai_object_id_t port_ = SAI_NULL_OBJECT_ID;
 };
 
 // Mux Neighbor Handler for adding/removing neigbhors
 class MuxNbrHandler
 {
-    public:
-        MuxNbrHandler() = default;
+public:
+    MuxNbrHandler() = default;
 
-        bool enable();
-        bool disable();
-        void update(IpAddress, string alias = "", bool = true);
+    bool enable();
+    bool disable();
+    void update(IpAddress, string alias = "", bool = true);
 
-    private:
-        IpAddresses neighbors_;
-        string alias_;
+private:
+    IpAddresses neighbors_;
+    string alias_;
 };
 
 // Mux Cable object
@@ -75,8 +75,8 @@ class MuxCable
         return (state_ == MuxState::MUX_STATE_ACTIVE);
     }
 
-    typedef pair<MuxStateChange, bool (MuxCable::*)()> handler_pair;
-    typedef map<MuxStateChange, bool (MuxCable::*)()> state_machine_handlers;
+    using handler_pair = pair<MuxStateChange, bool (MuxCable::*)()>;
+    using state_machine_handlers = map<MuxStateChange, bool (MuxCable::*)()>;
 
     void setState(string state);
     string getState();
@@ -146,8 +146,8 @@ class MuxOrch : public Orch2, public Observer, public Subject
 public:
     MuxOrch(DBConnector *db, const std::vector<std::string> &tables, TunnelDecapOrch*, NeighOrch*);
 
-    typedef pair<string, bool (MuxOrch::*) (const Request& )> handler_pair;
-    typedef map<string, bool (MuxOrch::*) (const Request& )> handler_map;
+    using handler_pair = pair<string, bool (MuxOrch::*) (const Request& )>;
+    using handler_map = map<string, bool (MuxOrch::*) (const Request& )>;
 
     bool isMuxExists(const std::string& portName) const
     {