diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c
index 354fa3fcb5..1e1c2325eb 100644
--- a/arch/arm/src/kinetis/kinetis_pindump.c
+++ b/arch/arm/src/kinetis/kinetis_pindump.c
@@ -54,6 +54,7 @@
 /****************************************************************************
  * Private Data
  ****************************************************************************/
+
 /* Port letters for prettier debug output */
 
 static const char g_portchar[KINETIS_NPORTS] =
@@ -83,14 +84,6 @@ static const char g_portchar[KINETIS_NPORTS] =
 #endif
 };
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 0cf31bbd90..23438917f7 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -120,6 +120,7 @@ struct kinetis_pwmtimer_s
 /****************************************************************************
  * Static Function Prototypes
  ****************************************************************************/
+
 /* Register access */
 
 static uint32_t pwm_getreg(struct kinetis_pwmtimer_s *priv, int offset);
@@ -151,7 +152,10 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev,
 /****************************************************************************
  * Private Data
  ****************************************************************************/
-/* This is the list of lower half PWM driver methods used by the upper half driver */
+
+/* This is the list of lower half PWM driver methods used by the upper half
+ * driver.
+ */
 
 static const struct pwm_ops_s g_pwmops =
 {
diff --git a/arch/arm/src/kinetis/kinetis_pwm.h b/arch/arm/src/kinetis/kinetis_pwm.h
index e9db2c1d77..09508d4bfe 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.h
+++ b/arch/arm/src/kinetis/kinetis_pwm.h
@@ -49,6 +49,7 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
+
 /* Configuration ********************************************************************/
 /* Timer devices may be used for different purposes.  One special purpose is
  * to generate modulated outputs for such things as motor control.  If CONFIG_KINETIS_FTMn
diff --git a/configs/teensy-3.x/src/Makefile b/configs/teensy-3.x/src/Makefile
index 87734c76c0..3483e6deb2 100644
--- a/configs/teensy-3.x/src/Makefile
+++ b/configs/teensy-3.x/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/teensy-3.x/src/Makefile
 #
-#   Copyright (C) 2015,2016 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c
index 94af831308..73ec5c5414 100644
--- a/configs/teensy-3.x/src/k20_pwm.c
+++ b/configs/teensy-3.x/src/k20_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/teensy-3.x/src/k20_pwm.c
  *
- *   Copyright (C) 2015,2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           Alan Carvalho de Assis <acassis@gmail.com>
  *
@@ -93,8 +93,9 @@ int board_pwm_setup(void)
 
   if (!initialized)
     {
-      /* Call kinetis_pwminitialize() to get an instance of the PWM interface */
 #ifdef CONFIG_KINETIS_FTM0_PWM
+      /* Call kinetis_pwminitialize() to get an instance of the PWM interface */
+
       pwm = kinetis_pwminitialize(0);
       if (!pwm)
         {
@@ -113,6 +114,7 @@ int board_pwm_setup(void)
 
       /* Now we are initialized */
 #endif
+
 #ifdef CONFIG_KINETIS_FTM1_PWM
       pwm = kinetis_pwminitialize(1);
       if (!pwm)
@@ -132,6 +134,7 @@ int board_pwm_setup(void)
 
       /* Now we are initialized */
 #endif
+
 #ifdef CONFIG_KINETIS_FTM2_PWM
       pwm = kinetis_pwminitialize(2);
       if (!pwm)