diff --git a/geocoder.drush.inc b/geocoder.drush.inc
index caad478..4099fe4 100644
--- a/geocoder.drush.inc
+++ b/geocoder.drush.inc
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Drush commands.
+ */
 
 /**
  * Implementation of hook_drush_command().
@@ -61,4 +65,4 @@ function geocoder_drush_backfill() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/geocoder.info b/geocoder.info
index c081da5..71ac0a2 100644
--- a/geocoder.info
+++ b/geocoder.info
@@ -1,6 +1,7 @@
+type = module
 name = Geocoder
 description = An API and widget to geocode various known data into other GIS data types.
 backdrop = 1.x
-type = module
 dependencies[] = geophp
+
 configure = admin/config/content/geocoder
diff --git a/geocoder.install b/geocoder.install
index 58da28d..6141ebb 100644
--- a/geocoder.install
+++ b/geocoder.install
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Install, update and uninstall functions for the Geocoder module.
diff --git a/geocoder.module b/geocoder.module
index b8fe32f..1c93cd0 100644
--- a/geocoder.module
+++ b/geocoder.module
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Module file for geocoder module.
diff --git a/geocoder.services.inc b/geocoder.services.inc
index 9f9e94e..4b021f9 100644
--- a/geocoder.services.inc
+++ b/geocoder.services.inc
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @file
+ * Services.
+ */
+
 /**
  * Implements hook_services_resources().
  */
diff --git a/plugins/geocoder_handler/bing.inc b/plugins/geocoder_handler/bing.inc
index a5337f2..cbdad91 100644
--- a/plugins/geocoder_handler/bing.inc
+++ b/plugins/geocoder_handler/bing.inc
@@ -1,6 +1,4 @@
 <?php
-// $Id$
-
 /**
  * @file
  * Plugin to provide a bing geocoder.
diff --git a/plugins/geocoder_handler/exif.inc b/plugins/geocoder_handler/exif.inc
index 89b5ce4..e20aba2 100644
--- a/plugins/geocoder_handler/exif.inc
+++ b/plugins/geocoder_handler/exif.inc
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Plugin for EXIF.
+ */
 
 $plugin = array(
   'title' => t("Image/exif"),
diff --git a/plugins/geocoder_handler/gpx.inc b/plugins/geocoder_handler/gpx.inc
index 362ac18..3e42e34 100644
--- a/plugins/geocoder_handler/gpx.inc
+++ b/plugins/geocoder_handler/gpx.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  *
diff --git a/plugins/geocoder_handler/json.inc b/plugins/geocoder_handler/json.inc
index acaeacb..77bc0bc 100644
--- a/plugins/geocoder_handler/json.inc
+++ b/plugins/geocoder_handler/json.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Plugin to provide a google geocoder.
diff --git a/plugins/geocoder_handler/kml.inc b/plugins/geocoder_handler/kml.inc
index 20b8343..5b82310 100644
--- a/plugins/geocoder_handler/kml.inc
+++ b/plugins/geocoder_handler/kml.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Plugin to provide a kml geocoder.
diff --git a/plugins/geocoder_handler/latlon.inc b/plugins/geocoder_handler/latlon.inc
index 30187f0..d6e7169 100644
--- a/plugins/geocoder_handler/latlon.inc
+++ b/plugins/geocoder_handler/latlon.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  */
diff --git a/plugins/geocoder_handler/mapbox.inc b/plugins/geocoder_handler/mapbox.inc
index 1a4a577..6cb5b6b 100644
--- a/plugins/geocoder_handler/mapbox.inc
+++ b/plugins/geocoder_handler/mapbox.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Plugin to provide a Mapbox geocoder.
diff --git a/plugins/geocoder_handler/mapquest_nominatim.inc b/plugins/geocoder_handler/mapquest_nominatim.inc
index 9a74fe4..9476f80 100644
--- a/plugins/geocoder_handler/mapquest_nominatim.inc
+++ b/plugins/geocoder_handler/mapquest_nominatim.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Plugin to provide a MapQuest Nominatim geocoder.
diff --git a/plugins/geocoder_handler/openstreetmap_nominatim.inc b/plugins/geocoder_handler/openstreetmap_nominatim.inc
index eb059db..b03f40d 100644
--- a/plugins/geocoder_handler/openstreetmap_nominatim.inc
+++ b/plugins/geocoder_handler/openstreetmap_nominatim.inc
@@ -1,6 +1,4 @@
 <?php
-// $Id$
-
 /**
  * @file
  * Plugin to provide a OpenStreetMap Nominatim geocoder.
diff --git a/plugins/geocoder_handler/wkt.inc b/plugins/geocoder_handler/wkt.inc
index 876d36a..238badd 100644
--- a/plugins/geocoder_handler/wkt.inc
+++ b/plugins/geocoder_handler/wkt.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Plugin to provide a WKT geocoder.
diff --git a/plugins/geocoder_handler/yahoo.inc b/plugins/geocoder_handler/yahoo.inc
index 82f4d9a..866e588 100644
--- a/plugins/geocoder_handler/yahoo.inc
+++ b/plugins/geocoder_handler/yahoo.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Plugin to provide a yahoo geocoder.
diff --git a/plugins/geocoder_handler/yandex.inc b/plugins/geocoder_handler/yandex.inc
index fee7ba1..5730966 100644
--- a/plugins/geocoder_handler/yandex.inc
+++ b/plugins/geocoder_handler/yandex.inc
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Plugin to provide a yandex geocoder.
@@ -80,4 +79,4 @@ function _geocoder_yandex_geometry(&$data) {
 
   $loc = explode(' ', $data->response->GeoObjectCollection->featureMember[0]->GeoObject->Point->pos);
   return new Point ($loc[0], $loc[1]);
-}
\ No newline at end of file
+}