diff --git a/LICENSE.md b/LICENSE.md
index db04d89..8f49f72 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/lib/cleanup.php b/lib/cleanup.php
index f966ca6..1057467 100644
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -256,7 +256,7 @@ function roots_request_filter($query_vars) {
 add_filter('request', 'roots_request_filter');
 
 /**
- * Tell WordPress to use searchform.php from the templates/ directory. Requires WordPress 3.6+
+ * Tell WordPress to use searchform.php from the templates/ directory
  */
 function roots_get_search_form($form) {
   $form = '';
diff --git a/lib/comments.php b/lib/comments.php
index 1ab88bd..ad1a87b 100644
--- a/lib/comments.php
+++ b/lib/comments.php
@@ -2,7 +2,7 @@
 /**
  * Use Bootstrap's media object for listing comments
  *
- * @link http://twitter.github.com/bootstrap/components.html#media
+ * @link http://getbootstrap.com/components/#media
  */
 class Roots_Walker_Comment extends Walker_Comment {
   function start_lvl(&$output, $depth = 0, $args = array()) {
diff --git a/lib/gallery.php b/lib/gallery.php
index a28693e..3bc6b64 100644
--- a/lib/gallery.php
+++ b/lib/gallery.php
@@ -5,7 +5,7 @@
  * Re-create the [gallery] shortcode and use thumbnails styling from Bootstrap
  * The number of columns must be a factor of 12.
  *
- * @link http://twbs.github.io/bootstrap/components/#thumbnails
+ * @link http://getbootstrap.com/components/#thumbnails
  */
 function roots_gallery($attr) {
   $post = get_post();
@@ -88,16 +88,16 @@ function roots_gallery($attr) {
     $image = ('file' == $link) ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
     $output .= ($i % $columns == 0) ? '<div class="row gallery-row">': '';
     $output .= '<div class="' . $grid .'">' . $image;
-    
+
     if (trim($attachment->post_excerpt)) {
       $output .= '<div class="caption hidden">' . wptexturize($attachment->post_excerpt) . '</div>';
     }
-    
+
     $output .= '</div>';
     $i++;
     $output .= ($i % $columns == 0) ? '</div>' : '';
   }
-  
+
   $output .= ($i % $columns != 0 ) ? '</div>' : '';
   $output .= '</div>';
 
diff --git a/lib/sidebar.php b/lib/sidebar.php
index f13c2c1..39acf99 100644
--- a/lib/sidebar.php
+++ b/lib/sidebar.php
@@ -4,11 +4,12 @@
  *
  * If any of the is_* conditional tags or is_page_template(template_file) checks return true, the sidebar will NOT be displayed.
  *
+ * @link http://roots.io/the-roots-sidebar/
+ *
  * @param array list of conditional tags (http://codex.wordpress.org/Conditional_Tags)
  * @param array list of page templates. These will be checked via is_page_template()
  *
  * @return boolean True will display the sidebar, False will not
- *
  */
 class Roots_Sidebar {
   private $conditionals;
diff --git a/lib/wrapper.php b/lib/wrapper.php
index c63aa80..7b6a29f 100644
--- a/lib/wrapper.php
+++ b/lib/wrapper.php
@@ -2,6 +2,7 @@
 /**
  * Theme wrapper
  *
+ * @link http://roots.io/an-introduction-to-the-roots-theme-wrapper/
  * @link http://scribu.net/wordpress/theme-wrappers.html
  */
 function roots_template_path() {
@@ -19,21 +20,21 @@ class Roots_Wrapping {
   // Stores the base name of the template file; e.g. 'page' for 'page.php' etc.
   static $base;
 
-  public function __construct($template='base.php') {
+  public function __construct($template = 'base.php') {
     $this->slug = basename($template, '.php');
     $this->templates = array($template);
-    
+
     if (self::$base) {
       $str = substr($template, 0, -4);
       array_unshift($this->templates, sprintf($str . '-%s.php', self::$base));
     }
   }
-  
+
   public function __toString() {
     $this->templates = apply_filters('roots_wrap_' . $this->slug, $this->templates);
     return locate_template($this->templates);
   }
-  
+
   static function wrap($main) {
     self::$main_template = $main;
     self::$base = basename(self::$main_template, '.php');
@@ -41,7 +42,7 @@ class Roots_Wrapping {
     if (self::$base === 'index') {
       self::$base = false;
     }
-    
+
     return new Roots_Wrapping();
   }
 }
diff --git a/page.php b/page.php
index 23c4afe..82baa27 100644
--- a/page.php
+++ b/page.php
@@ -1,2 +1,2 @@
 <?php get_template_part('templates/page', 'header'); ?>
-<?php get_template_part('templates/content', 'page'); ?>
\ No newline at end of file
+<?php get_template_part('templates/content', 'page'); ?>
diff --git a/single.php b/single.php
index eb13dcf..8850252 100644
--- a/single.php
+++ b/single.php
@@ -1 +1 @@
-<?php get_template_part('templates/content', 'single'); ?>
\ No newline at end of file
+<?php get_template_part('templates/content', 'single'); ?>
diff --git a/template-custom.php b/template-custom.php
index 3507c7d..547353a 100644
--- a/template-custom.php
+++ b/template-custom.php
@@ -5,4 +5,4 @@ Template Name: Custom Template
 ?>
 
 <?php get_template_part('templates/page', 'header'); ?>
-<?php get_template_part('templates/content', 'page'); ?>
\ No newline at end of file
+<?php get_template_part('templates/content', 'page'); ?>
diff --git a/templates/content-page.php b/templates/content-page.php
index 4a77cd3..20a30e3 100644
--- a/templates/content-page.php
+++ b/templates/content-page.php
@@ -1,4 +1,4 @@
 <?php while (have_posts()) : the_post(); ?>
   <?php the_content(); ?>
   <?php wp_link_pages(array('before' => '<nav class="pagination">', 'after' => '</nav>')); ?>
-<?php endwhile; ?>
\ No newline at end of file
+<?php endwhile; ?>
diff --git a/templates/footer.php b/templates/footer.php
index 3de48d6..be83352 100644
--- a/templates/footer.php
+++ b/templates/footer.php
@@ -7,4 +7,4 @@
   </div>
 </footer>
 
-<?php wp_footer(); ?>
\ No newline at end of file
+<?php wp_footer(); ?>
diff --git a/templates/header.php b/templates/header.php
index 0d41a6b..9836ccb 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -11,4 +11,4 @@
       </nav>
     </div>
   </div>
-</header>
\ No newline at end of file
+</header>
diff --git a/templates/page-header.php b/templates/page-header.php
index 4f0265b..a7d2482 100644
--- a/templates/page-header.php
+++ b/templates/page-header.php
@@ -2,4 +2,4 @@
   <h1>
     <?php echo roots_title(); ?>
   </h1>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/sidebar.php b/templates/sidebar.php
index 45e0950..244f9b7 100644
--- a/templates/sidebar.php
+++ b/templates/sidebar.php
@@ -1 +1 @@
-<?php dynamic_sidebar('sidebar-primary'); ?>
\ No newline at end of file
+<?php dynamic_sidebar('sidebar-primary'); ?>