diff --git a/core/modules/breakpoint/breakpoint.install b/core/modules/breakpoint/breakpoint.install
new file mode 100644
index 0000000..0e6bc30
--- /dev/null
+++ b/core/modules/breakpoint/breakpoint.install
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Enable, install, update and uninstall functions for the breakpoint module.
+ */
+
+/**
+ * Implements hook_enable().
+ *
+ * Import breakpoints from all enabled themes.
+ *
+ * @todo: This should be removed if https://drupal.org/node/1813100 is resolved.
+ */
+function breakpoint_enable() {
+  // Import breakpoints from themes.
+  $themes = list_themes();
+  _breakpoint_theme_enabled(array_keys($themes));
+
+  // Import breakpoints from modules.
+  $modules = module_list();
+  _breakpoint_modules_enabled(array_keys($modules));
+}
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index 2b07f22..455c1fd 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -33,23 +33,6 @@ function breakpoint_help($path, $arg) {
 }
 
 /**
- * Implements hook_enable().
- *
- * Import breakpoints from all enabled themes.
- *
- * @todo: This should be removed if https://drupal.org/node/1813100 is resolved.
- */
-function breakpoint_enable() {
-  // Import breakpoints from themes.
-  $themes = list_themes();
-  _breakpoint_theme_enabled(array_keys($themes));
-
-  // Import breakpoints from modules.
-  $modules = module_list();
-  _breakpoint_modules_enabled(array_keys($modules));
-}
-
-/**
  * Implements hook_themes_enabled().
  *
  * @param array $theme_list
@@ -86,7 +69,7 @@ function breakpoint_themes_disabled($theme_list) {
  * @see _breakpoint_modules_enabled()
  *
  * @todo: This should be removed if https://drupal.org/node/1813100 is resolved.
-*/
+ */
 function breakpoint_modules_enabled($modules) {
   _breakpoint_modules_enabled($modules);
 }
@@ -145,7 +128,7 @@ function _breakpoint_modules_enabled($modules) {
  *   Machine readable name of the breakpoint group.
  * @param string $label
  *   Human readable name of the breakpoint group.
- * @param string $sourceType
+ * @param string $source_type
  *   Either Breakpoint::SOURCE_TYPE_THEME or Breakpoint::SOURCE_TYPE_MODULE.
  * @param array $media_queries
  *   An array of breakpoints in the form $breakpoint['name'] = 'media query'.
@@ -170,7 +153,7 @@ function _breakpoint_import_media_queries($group_name, $label, $source_type, $me
  *
  * @param string $source
  *   The theme or module name
- * @param string $sourceType
+ * @param string $source_type
  *   Either Breakpoint::SOURCE_TYPE_THEME or Breakpoint::SOURCE_TYPE_MODULE.
  */
 function _breakpoint_import_breakpoint_groups($source, $source_type) {
@@ -201,7 +184,7 @@ function _breakpoint_import_breakpoint_groups($source, $source_type) {
  *
  * @param array $list
  *   A list of modules or themes that are disabled.
- * @param string $sourceType
+ * @param string $source_type
  *   Either Breakpoint::SOURCE_TYPE_THEME or Breakpoint::SOURCE_TYPE_MODULE.
  */
 function _breakpoint_delete_breakpoints($list, $source_type) {
@@ -251,7 +234,7 @@ function _breakpoint_delete_breakpoints($list, $source_type) {
  *
  * @param array $group_id
  *   Machine readable name of the breakpoint group.
- * @param string $sourceType
+ * @param string $source_type
  *   Either Breakpoint::SOURCE_TYPE_THEME or Breakpoint::SOURCE_TYPE_MODULE.
  */
 function _breakpoint_delete_breakpoint_groups($group_id, $source_type) {
@@ -397,7 +380,7 @@ function breakpoint_select_options() {
   $options = array();
   $breakpoints = entity_load_multiple('breakpoint');
   foreach ($breakpoints as $breakpoint) {
-    $options[$breakpoint->id()] = $breakpoint->label() . ' (' . $breakpoint->source . ' - ' . $breakpoint->sourceType .   ') [' . $breakpoint->mediaQuery . ']';
+    $options[$breakpoint->id()] = $breakpoint->label() . ' (' . $breakpoint->source . ' - ' . $breakpoint->sourceType . ') [' . $breakpoint->mediaQuery . ']';
   }
   asort($options);
   return $options;
@@ -412,7 +395,7 @@ function breakpoint_select_options() {
  *   Human readable name of the breakpoint group.
  * @param string $source
  *   Machine readable name of the defining theme or module.
- * @param string $sourceType
+ * @param string $source_type
  *   Either Breakpoint::SOURCE_TYPE_THEME or Breakpoint::SOURCE_TYPE_MODULE.
  *
  * @return Drupal\breakpoint\BreakpointGroup
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php
index db9caf2..b695e47 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php
@@ -222,8 +222,8 @@ public static function isValidMediaQuery($media_query) {
             elseif (isset($matches[3]) && !isset($matches[4])) {
               $value = trim($matches[3]);
               if (!array_key_exists($matches[1], $media_features)) {
-                // We need to allow vendor prefixed media fetures and make sure we
-                // are future proof, so only check allowed characters.
+                // We need to allow vendor prefixed media features and make sure
+                // we are future proof, so only check allowed characters.
                 if (!preg_match('/^[a-zA-Z0-9\:\-\\ ]+$/i', trim($matches[1]))) {
                   throw new InvalidBreakpointMediaQueryException('Invalid media query detected.');
                 }
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php
index b6e6a9f..fc47e91 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php
@@ -30,7 +30,7 @@ class BreakpointGroup extends ConfigEntityBase {
    */
   public $uuid;
 
- /**
+  /**
    * The breakpoint group machine name.
    *
    * @var string