diff --git a/drmmode.cpp b/drmmode.cpp
index abd3b32..7f8c04d 100644
--- a/drmmode.cpp
+++ b/drmmode.cpp
@@ -68,8 +68,7 @@
          h_total_ == m.htotal && h_skew_ == m.hskew &&
          v_display_ == m.vdisplay && v_sync_start_ == m.vsync_start &&
          v_sync_end_ == m.vsync_end && v_total_ == m.vtotal &&
-         v_scan_ == m.vscan && flags_ == m.flags &&
-         type_ == m.type;
+         v_scan_ == m.vscan && flags_ == m.flags && type_ == m.type;
 }
 
 void DrmMode::ToDrmModeModeInfo(drm_mode_modeinfo *m) const {
diff --git a/drmproperty.cpp b/drmproperty.cpp
index 378e3a2..7b4a4f9 100644
--- a/drmproperty.cpp
+++ b/drmproperty.cpp
@@ -71,7 +71,6 @@
     type_ = DRM_PROPERTY_TYPE_OBJECT;
   else if (flags_ & DRM_MODE_PROP_BLOB)
     type_ = DRM_PROPERTY_TYPE_BLOB;
-
 }
 
 uint32_t DrmProperty::id() const {
diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index a83c247..787be72 100644
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -73,7 +73,7 @@
   Importer *importer;
 };
 
-static void hwc_dump(struct hwc_composer_device_1* dev, char *buff,
+static void hwc_dump(struct hwc_composer_device_1 *dev, char *buff,
                      int buff_len) {
   struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
   std::ostringstream out;
@@ -159,8 +159,8 @@
 
   if (display_contents->retireFenceFd >= 0) {
     int old_retire_fence = display_contents->retireFenceFd;
-    display_contents->retireFenceFd = sync_merge("dc_retire", old_retire_fence,
-                                                 layer->releaseFenceFd);
+    display_contents->retireFenceFd =
+        sync_merge("dc_retire", old_retire_fence, layer->releaseFenceFd);
     close(old_retire_fence);
   } else {
     display_contents->retireFenceFd = dup(layer->releaseFenceFd);
diff --git a/nvimporter.cpp b/nvimporter.cpp
index 93b9129..de3ed55 100644
--- a/nvimporter.cpp
+++ b/nvimporter.cpp
@@ -121,7 +121,7 @@
   return 0;
 }
 
-int NvImporter::ReleaseBuffer(hwc_drm_bo_t * bo) {
+int NvImporter::ReleaseBuffer(hwc_drm_bo_t *bo) {
   NvBuffer_t *buf = (NvBuffer_t *)bo->priv;
   if (!buf) {
     ALOGE("Freeing bo %ld, buf is NULL!", bo->fb_id);