diff --git a/cpp/ycm/ClangCompleter/ClangCompleter.cpp b/cpp/ycm/ClangCompleter/ClangCompleter.cpp
index cc6a8240..9fd5f29a 100644
--- a/cpp/ycm/ClangCompleter/ClangCompleter.cpp
+++ b/cpp/ycm/ClangCompleter/ClangCompleter.cpp
@@ -263,11 +263,11 @@ ClangCompleter::CandidatesForQueryAndLocationInFileAsync(
 
 
 Location ClangCompleter::GetDeclarationLocation(
-    const std::string &filename,
-    int line,
-    int column,
-    const std::vector< UnsavedFile > &unsaved_files,
-    const std::vector< std::string > &flags ) {
+  const std::string &filename,
+  int line,
+  int column,
+  const std::vector< UnsavedFile > &unsaved_files,
+  const std::vector< std::string > &flags ) {
   shared_ptr< TranslationUnit > unit = GetTranslationUnitForFile(
                                          filename,
                                          unsaved_files,
@@ -277,11 +277,11 @@ Location ClangCompleter::GetDeclarationLocation(
 
 
 Location ClangCompleter::GetDefinitionLocation(
-    const std::string &filename,
-    int line,
-    int column,
-    const std::vector< UnsavedFile > &unsaved_files,
-    const std::vector< std::string > &flags ) {
+  const std::string &filename,
+  int line,
+  int column,
+  const std::vector< UnsavedFile > &unsaved_files,
+  const std::vector< std::string > &flags ) {
   shared_ptr< TranslationUnit > unit = GetTranslationUnitForFile(
                                          filename,
                                          unsaved_files,
diff --git a/cpp/ycm/ClangCompleter/TranslationUnit.cpp b/cpp/ycm/ClangCompleter/TranslationUnit.cpp
index 3366d46c..78b534ca 100644
--- a/cpp/ycm/ClangCompleter/TranslationUnit.cpp
+++ b/cpp/ycm/ClangCompleter/TranslationUnit.cpp
@@ -135,7 +135,7 @@ void TranslationUnit::Reparse(
 void TranslationUnit::ReparseForIndexing(
   const std::vector< UnsavedFile > &unsaved_files ) {
   std::vector< CXUnsavedFile > cxunsaved_files =
-      ToCXUnsavedFiles( unsaved_files );
+    ToCXUnsavedFiles( unsaved_files );
 
   Reparse( cxunsaved_files,
            CXTranslationUnit_PrecompiledPreamble |
@@ -181,9 +181,9 @@ std::vector< CompletionData > TranslationUnit::CandidatesForLocation(
 }
 
 Location TranslationUnit::GetDeclarationLocation(
-    int line,
-    int column,
-    const std::vector< UnsavedFile > &unsaved_files ) {
+  int line,
+  int column,
+  const std::vector< UnsavedFile > &unsaved_files ) {
   ReparseForIndexing( unsaved_files );
   unique_lock< mutex > lock( clang_access_mutex_ );
 
@@ -191,21 +191,23 @@ Location TranslationUnit::GetDeclarationLocation(
     return Location();
 
   CXCursor cursor = GetCursor( line, column );
+
   if ( !CursorIsValid( cursor ) )
     return Location();
 
   CXCursor referenced_cursor = clang_getCursorReferenced( cursor );
+
   if ( !CursorIsValid( referenced_cursor ) )
     return Location();
 
   return LocationFromSourceLocation(
-      clang_getCursorLocation( referenced_cursor ) );
+           clang_getCursorLocation( referenced_cursor ) );
 }
 
 Location TranslationUnit::GetDefinitionLocation(
-    int line,
-    int column,
-    const std::vector< UnsavedFile > &unsaved_files ) {
+  int line,
+  int column,
+  const std::vector< UnsavedFile > &unsaved_files ) {
   ReparseForIndexing( unsaved_files );
   unique_lock< mutex > lock( clang_access_mutex_ );
 
@@ -213,15 +215,17 @@ Location TranslationUnit::GetDefinitionLocation(
     return Location();
 
   CXCursor cursor = GetCursor( line, column );
+
   if ( !CursorIsValid( cursor ) )
     return Location();
 
   CXCursor definition_cursor = clang_getCursorDefinition( cursor );
+
   if ( !CursorIsValid( definition_cursor ) )
     return Location();
 
   return LocationFromSourceLocation(
-      clang_getCursorLocation( definition_cursor ) );
+           clang_getCursorLocation( definition_cursor ) );
 }
 
 
@@ -284,16 +288,16 @@ CXCursor TranslationUnit::GetCursor( int line, int column ) {
 
   CXFile file = clang_getFile( clang_translation_unit_, filename_.c_str() );
   CXSourceLocation source_location = clang_getLocation(
-      clang_translation_unit_,
-      file,
-      line,
-      column );
+                                       clang_translation_unit_,
+                                       file,
+                                       line,
+                                       column );
 
   return clang_getCursor( clang_translation_unit_, source_location );
 }
 
 Location TranslationUnit::LocationFromSourceLocation(
-    CXSourceLocation source_location ) {
+  CXSourceLocation source_location ) {
   // ASSUMES A LOCK IS ALREADY HELD ON clang_access_mutex_!
   if ( !clang_translation_unit_ )
     return Location();
diff --git a/cpp/ycm/tests/ClangCompleter/TranslationUnit_test.cpp b/cpp/ycm/tests/ClangCompleter/TranslationUnit_test.cpp
index 2ce0c3c6..aa129f81 100644
--- a/cpp/ycm/tests/ClangCompleter/TranslationUnit_test.cpp
+++ b/cpp/ycm/tests/ClangCompleter/TranslationUnit_test.cpp
@@ -70,9 +70,9 @@ TEST_F( TranslationUnitTest, GoToDefinitionWorks ) {
                         clang_index_ );
 
   Location location = unit.GetDefinitionLocation(
-      15,
-      3,
-      std::vector< UnsavedFile >() );
+                        15,
+                        3,
+                        std::vector< UnsavedFile >() );
 
   EXPECT_EQ( 1, location.line_number_ );
   EXPECT_EQ( 8, location.column_number_ );
@@ -89,9 +89,9 @@ TEST_F( TranslationUnitTest, GoToDefinitionFails ) {
                         clang_index_ );
 
   Location location = unit.GetDefinitionLocation(
-      17,
-      3,
-      std::vector< UnsavedFile >() );
+                        17,
+                        3,
+                        std::vector< UnsavedFile >() );
 
   EXPECT_FALSE( location.IsValid() );
 }
@@ -106,9 +106,9 @@ TEST_F( TranslationUnitTest, GoToDeclarationWorks ) {
                         clang_index_ );
 
   Location location = unit.GetDeclarationLocation(
-      17,
-      3,
-      std::vector< UnsavedFile >() );
+                        17,
+                        3,
+                        std::vector< UnsavedFile >() );
 
   EXPECT_EQ( 12, location.line_number_ );
   EXPECT_EQ( 8, location.column_number_ );