diff --git a/src/lock_mgr.cc b/src/lock_mgr.cc
index 08488b88a2..31e6f8260c 100644
--- a/src/lock_mgr.cc
+++ b/src/lock_mgr.cc
@@ -67,18 +67,6 @@ struct LockMap {
   size_t GetStripe(const std::string& key) const;
 };
 
-LockMgr::LockMgr(size_t default_num_stripes,
-    int64_t max_num_locks,
-    std::shared_ptr<MutexFactory> mutex_factory)
-    : default_num_stripes_(default_num_stripes),
-      max_num_locks_(max_num_locks),
-      mutex_factory_(mutex_factory),
-      lock_map_(std::shared_ptr<LockMap>(
-                    new LockMap(default_num_stripes,
-                        mutex_factory))) {}
-
-LockMgr::~LockMgr() {}
-
 size_t LockMap::GetStripe(const std::string& key) const {
   assert(num_stripes_ > 0);
   static murmur_hash hash;
@@ -86,6 +74,16 @@ size_t LockMap::GetStripe(const std::string& key) const {
   return stripe;
 }
 
+LockMgr::LockMgr(size_t default_num_stripes,
+                 int64_t max_num_locks,
+                 std::shared_ptr<MutexFactory> mutex_factory)
+    : default_num_stripes_(default_num_stripes),
+      max_num_locks_(max_num_locks),
+      mutex_factory_(mutex_factory),
+      lock_map_(std::shared_ptr<LockMap>(new LockMap(default_num_stripes, mutex_factory))) {}
+
+LockMgr::~LockMgr() {}
+
 Status LockMgr::TryLock(const std::string& key) {
 #ifdef LOCKLESS
   return Status::OK();
@@ -99,8 +97,8 @@ Status LockMgr::TryLock(const std::string& key) {
 }
 
 // Helper function for TryLock().
-Status LockMgr::Acquire(
-    LockMapStripe* stripe, const std::string& key) {
+Status LockMgr::Acquire(LockMapStripe* stripe,
+                        const std::string& key) {
   Status result;
 
   // we wait indefinitely to acquire the lock