diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa7d2d..4740d6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### HEAD
+* Move nav customizations into `lib/nav.php`
+
 ### 6.1.0: October 2nd, 2012
 * Change roots_sidebar into a more explicit configuration array
 * Re-organize configuration/setup files
diff --git a/doc/lib.md b/doc/lib.md
index fa89bbf..e2c1590 100644
--- a/doc/lib.md
+++ b/doc/lib.md
@@ -59,6 +59,10 @@ This file runs the initial theme setup and defines helper constants for later us
 
 This file is a placeholder for you to put in custom metaboxes. We recommend the use of [Custom Metaboxes and Fields for WordPress](https://github.com/jaredatch/Custom-Metaboxes-and-Fields-for-WordPress).
 
+### nav.php
+
+This file contains all the custom nav modifications (for Bootstrap) and cleanup.
+
 ### post-types.php
 
 This file is a placeholder for you to put in [custom post types](http://codex.wordpress.org/Function_Reference/register_post_type) and [taxonomies](http://codex.wordpress.org/Function_Reference/register_taxonomy).
diff --git a/functions.php b/functions.php
index c2a1d0e..08c0bbf 100644
--- a/functions.php
+++ b/functions.php
@@ -11,6 +11,7 @@ require_once locate_template('/lib/sidebar.php');         // Sidebar class
 require_once locate_template('/lib/config.php');          // Configuration
 require_once locate_template('/lib/activation.php');      // Theme activation
 require_once locate_template('/lib/cleanup.php');         // Cleanup
+require_once locate_template('/lib/nav.php');             // Custom nav modifications
 require_once locate_template('/lib/htaccess.php');        // Rewrites for assets, H5BP .htaccess
 require_once locate_template('/lib/widgets.php');         // Sidebars and widgets
 require_once locate_template('/lib/scripts.php');         // Scripts and stylesheets
diff --git a/lib/cleanup.php b/lib/cleanup.php
index e4d25f9..dfec989 100644
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -407,107 +407,6 @@ function roots_excerpt_more($more) {
 add_filter('excerpt_length', 'roots_excerpt_length');
 add_filter('excerpt_more', 'roots_excerpt_more');
 
-/**
- * Cleaner walker for wp_nav_menu()
- *
- * Walker_Nav_Menu (WordPress default) example output:
- *   <li id="menu-item-8" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-8"><a href="/">Home</a></li>
- *   <li id="menu-item-9" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-9"><a href="/sample-page/">Sample Page</a></l
- *
- * Roots_Nav_Walker example output:
- *   <li class="menu-home"><a href="/">Home</a></li>
- *   <li class="menu-sample-page"><a href="/sample-page/">Sample Page</a></li>
- */
-class Roots_Nav_Walker extends Walker_Nav_Menu {
-  function check_current($classes) {
-    return preg_match('/(current[-_])|active|dropdown/', $classes);
-  }
-
-  function start_lvl(&$output, $depth = 0, $args = array()) {
-    $output .= "\n<ul class=\"dropdown-menu\">\n";
-  }
-
-  function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
-    $item_html = '';
-    parent::start_el($item_html, $item, $depth, $args);
-
-    if ($item->is_dropdown && ($depth === 0)) {
-      $item_html = str_replace('<a', '<a class="dropdown-toggle" data-toggle="dropdown" data-target="#"', $item_html);
-      $item_html = str_replace('</a>', ' <b class="caret"></b></a>', $item_html);
-    }
-    elseif (in_array('divider-vertical', $item->classes)) {
-      $item_html = '<li class="divider-vertical">';
-    }  
-    elseif (in_array('divider', $item->classes)) {
-      $item_html = '<li class="divider">';
-    }
-    elseif (in_array('nav-header', $item->classes)) {
-      $item_html = '<li class="nav-header">' . $item->title;
-    }
-
-    $output .= $item_html;
-  }
-
-  function display_element($element, &$children_elements, $max_depth, $depth = 0, $args, &$output) {
-    $element->is_dropdown = !empty($children_elements[$element->ID]);
-
-    if ($element->is_dropdown) {
-      if ($depth === 0) {
-        $element->classes[] = 'dropdown';
-      } elseif ($depth === 1) {
-        $element->classes[] = 'dropdown-submenu';
-      }
-    }
-
-    parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output);
-  }
-}
-
-/**
- * Remove the id="" on nav menu items
- * Return 'menu-slug' for nav menu classes
- */
-function roots_nav_menu_css_class($classes, $item) {
-  $slug = sanitize_title($item->title);
-  $classes = preg_replace('/(current(-menu-|[-_]page[-_])(item|parent|ancestor))/', 'active', $classes);
-  $classes = preg_replace('/((menu|page)[-_\w+]+)+/', '', $classes);
-
-  $classes[] = 'menu-' . $slug;
-
-  $classes = array_unique($classes);
-
-  return array_filter($classes, 'is_element_empty');
-}
-
-add_filter('nav_menu_css_class', 'roots_nav_menu_css_class', 10, 2);
-add_filter('nav_menu_item_id', '__return_null');
-
-/**
- * Clean up wp_nav_menu_args
- *
- * Remove the container
- * Use Roots_Nav_Walker() by default
- */
-function roots_nav_menu_args($args = '') {
-  $roots_nav_menu_args['container'] = false;
-
-  if (!$args['items_wrap']) {
-    $roots_nav_menu_args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
-  }
-
-  if (current_theme_supports('bootstrap-top-navbar')) {
-    $roots_nav_menu_args['depth'] = 3;
-  }
-
-  if (!$args['walker']) {
-    $roots_nav_menu_args['walker'] = new Roots_Nav_Walker();
-  }
-
-  return array_merge($args, $roots_nav_menu_args);
-}
-
-add_filter('wp_nav_menu_args', 'roots_nav_menu_args');
-
 /**
  * Remove unnecessary self-closing tags
  */
diff --git a/lib/nav.php b/lib/nav.php
new file mode 100644
index 0000000..1d5be43
--- /dev/null
+++ b/lib/nav.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * Cleaner walker for wp_nav_menu()
+ *
+ * Walker_Nav_Menu (WordPress default) example output:
+ *   <li id="menu-item-8" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-8"><a href="/">Home</a></li>
+ *   <li id="menu-item-9" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-9"><a href="/sample-page/">Sample Page</a></l
+ *
+ * Roots_Nav_Walker example output:
+ *   <li class="menu-home"><a href="/">Home</a></li>
+ *   <li class="menu-sample-page"><a href="/sample-page/">Sample Page</a></li>
+ */
+class Roots_Nav_Walker extends Walker_Nav_Menu {
+  function check_current($classes) {
+    return preg_match('/(current[-_])|active|dropdown/', $classes);
+  }
+
+  function start_lvl(&$output, $depth = 0, $args = array()) {
+    $output .= "\n<ul class=\"dropdown-menu\">\n";
+  }
+
+  function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
+    $item_html = '';
+    parent::start_el($item_html, $item, $depth, $args);
+
+    if ($item->is_dropdown && ($depth === 0)) {
+      $item_html = str_replace('<a', '<a class="dropdown-toggle" data-toggle="dropdown" data-target="#"', $item_html);
+      $item_html = str_replace('</a>', ' <b class="caret"></b></a>', $item_html);
+    }
+    elseif (in_array('divider-vertical', $item->classes)) {
+      $item_html = '<li class="divider-vertical">';
+    }  
+    elseif (in_array('divider', $item->classes)) {
+      $item_html = '<li class="divider">';
+    }
+    elseif (in_array('nav-header', $item->classes)) {
+      $item_html = '<li class="nav-header">' . $item->title;
+    }
+
+    $output .= $item_html;
+  }
+
+  function display_element($element, &$children_elements, $max_depth, $depth = 0, $args, &$output) {
+    $element->is_dropdown = !empty($children_elements[$element->ID]);
+
+    if ($element->is_dropdown) {
+      if ($depth === 0) {
+        $element->classes[] = 'dropdown';
+      } elseif ($depth === 1) {
+        $element->classes[] = 'dropdown-submenu';
+      }
+    }
+
+    parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output);
+  }
+}
+
+/**
+ * Remove the id="" on nav menu items
+ * Return 'menu-slug' for nav menu classes
+ */
+function roots_nav_menu_css_class($classes, $item) {
+  $slug = sanitize_title($item->title);
+  $classes = preg_replace('/(current(-menu-|[-_]page[-_])(item|parent|ancestor))/', 'active', $classes);
+  $classes = preg_replace('/((menu|page)[-_\w+]+)+/', '', $classes);
+
+  $classes[] = 'menu-' . $slug;
+
+  $classes = array_unique($classes);
+
+  return array_filter($classes, 'is_element_empty');
+}
+
+add_filter('nav_menu_css_class', 'roots_nav_menu_css_class', 10, 2);
+add_filter('nav_menu_item_id', '__return_null');
+
+/**
+ * Clean up wp_nav_menu_args
+ *
+ * Remove the container
+ * Use Roots_Nav_Walker() by default
+ */
+function roots_nav_menu_args($args = '') {
+  $roots_nav_menu_args['container'] = false;
+
+  if (!$args['items_wrap']) {
+    $roots_nav_menu_args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
+  }
+
+  if (current_theme_supports('bootstrap-top-navbar')) {
+    $roots_nav_menu_args['depth'] = 3;
+  }
+
+  if (!$args['walker']) {
+    $roots_nav_menu_args['walker'] = new Roots_Nav_Walker();
+  }
+
+  return array_merge($args, $roots_nav_menu_args);
+}
+
+add_filter('wp_nav_menu_args', 'roots_nav_menu_args');
+