diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc
index 61985051795146b35928cfea8f37ea68f18c0ce5..aca15dc5eb5791a8786cddd46742d599b29762f2 100644
--- a/src/cpp/common/alarm.cc
+++ b/src/cpp/common/alarm.cc
@@ -39,21 +39,22 @@
 namespace grpc {
 
 class AlarmEntry : public CompletionQueueTag {
-public:
-  AlarmEntry(void *tag): tag_(tag) {}
+ public:
+  AlarmEntry(void* tag) : tag_(tag) {}
   bool FinalizeResult(void** tag, bool* status) GRPC_OVERRIDE {
     *tag = tag_;
     delete this;
     return true;
   }
-private:
+
+ private:
   void* tag_;
 };
 
 static internal::GrpcLibraryInitializer g_gli_initializer;
 Alarm::Alarm(CompletionQueue* cq, gpr_timespec deadline, void* tag)
-  : alarm_(grpc_alarm_create(cq->cq(), deadline,
-			     static_cast<void*>(new AlarmEntry(tag)))) {
+    : alarm_(grpc_alarm_create(cq->cq(), deadline,
+                               static_cast<void*>(new AlarmEntry(tag)))) {
   g_gli_initializer.summon();
 }
 
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index b2d56c8bf1d9db306ae1945f21a03a1a64ba8700..db38995b776a08fe47bac25e208d96d03a7bf7b4 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -1313,8 +1313,6 @@
   }, 
   {
     "deps": [
-      "gpr", 
-      "gpr_test_util", 
       "grpc", 
       "grpc++", 
       "grpc++_test_util", 
@@ -1329,6 +1327,8 @@
   }, 
   {
     "deps": [
+      "gpr", 
+      "gpr_test_util", 
       "grpc", 
       "grpc++", 
       "grpc++_test_util",