diff --git a/.travis.yml b/.travis.yml
index 1ec5a28f42f31144b57e13bed367217427514aa5..76aa3e99f9be7156dee351405648cde171f16a25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ before_install:
 script:
   - docker run --name nav2_bash --rm -d -i -t nav2:latest bash -l
   - docker exec nav2_bash bash -c '. /ros2_ws/navigation2_ws/install/setup.bash &&
-      colcon test --packages-skip dwb_controller dwb_core nav2_amcl nav2_costmap_2d
+      colcon test --packages-skip dwb_controller nav2_costmap_2d
         nav2_dynamic_params nav2_map_server nav2_navfn_planner nav2_robot nav2_system_tests
         nav2_tasks'
   - docker exec nav2_bash bash -c "colcon test-result --verbose"
diff --git a/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp b/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp
index a79b1e615e7f2f40729810a9ee561a677d75e5ec..083f7ffed69ef35a17bab03066aca3c7521aa04e 100644
--- a/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp
+++ b/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef nav2_dwb_controller__DWB_CONTROLLER_HPP_
-#define nav2_dwb_controller__DWB_CONTROLLER_HPP_
+#ifndef DWB_CONTROLLER__DWB_CONTROLLER_HPP_
+#define DWB_CONTROLLER__DWB_CONTROLLER_HPP_
 
 #include <memory>
 #include <string>
@@ -29,7 +29,7 @@ namespace nav2_dwb_controller
 class DwbController : public rclcpp::Node
 {
 public:
-  DwbController(rclcpp::executor::Executor & executor);
+  explicit DwbController(rclcpp::executor::Executor & executor);
   ~DwbController();
 
   nav2_tasks::TaskStatus followPath(const nav2_tasks::FollowPathCommand::SharedPtr path);
@@ -51,4 +51,4 @@ protected:
 
 }  // namespace nav2_dwb_controller
 
-#endif  // nav2_dwb_controller__DWB_CONTROLLER_HPP_
+#endif  // DWB_CONTROLLER__DWB_CONTROLLER_HPP_
diff --git a/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp b/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp
index 42c79c01239b5e0541462b1d92a2518fd363da59..b16b67d9fb57295b0e9c8d829c433cc4201dee12 100644
--- a/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp
+++ b/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp
@@ -25,7 +25,7 @@ using nav2_tasks::TaskStatus;
 using dwb_core::DWBLocalPlanner;
 using dwb_core::CostmapROSPtr;
 
-#define NO_OP_DELETER [](auto){}
+#define NO_OP_DELETER [] (auto) {}
 
 namespace nav2_dwb_controller
 {
diff --git a/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp b/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp
index 7e42b3d78aba48f380af71910d49aed981e5ff40..997148fb6e95f2fe96d10664c2a9e5f91fec84f5 100644
--- a/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp
+++ b/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp
@@ -89,7 +89,10 @@ public:
    * @param parent_namespace The namespace of the planner
    * @param costmap_ros Pointer to the costmap
    */
-  void initialize(const std::shared_ptr<rclcpp::Node> & nh, std::string & name, CostmapROSPtr costmap_ros)
+  void initialize(
+    const std::shared_ptr<rclcpp::Node> & nh,
+    std::string & name,
+    CostmapROSPtr costmap_ros)
   {
     name_ = name;
     costmap_ros_ = costmap_ros;
diff --git a/nav2_dwb_controller/dwb_core/package.xml b/nav2_dwb_controller/dwb_core/package.xml
index 47d8e069b9db00d4ab09cd78402c162df99590af..b4ea850395873b5170d3d462031e96f5f8fe8f5c 100644
--- a/nav2_dwb_controller/dwb_core/package.xml
+++ b/nav2_dwb_controller/dwb_core/package.xml
@@ -4,9 +4,8 @@
   <name>dwb_core</name>
   <version>0.1.1</version>
   <description>TODO</description>
-  <license>Apache License 2.0</license>
-  <license>BSD</license>
   <maintainer email="carl.r.delsey@intel.com">Carl Delsey</maintainer>
+  <license>BSD</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>