diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..a8d9abf38
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,49 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
diff --git a/README.md b/README.md
index a463c1ec5..4c93bcb65 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # mini-redis
 
 A toy memory store that supports basic commands like `SET` and `GET` for both memcached and redis protocols.
-In addition it supports redis `PING` command.
+In addition, it supports redis `PING` command.
 
 Demo features include:
 1. High throughput reaching to millions of QPS on a single node.
diff --git a/server/command_registry.cc b/server/command_registry.cc
index dc4d0317f..f0448741e 100644
--- a/server/command_registry.cc
+++ b/server/command_registry.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/command_registry.h"
@@ -28,24 +28,26 @@ uint32_t CommandId::OptCount(uint32_t mask) {
 
 CommandRegistry::CommandRegistry() {
   CommandId cd("COMMAND", CO::RANDOM | CO::LOADING | CO::STALE, 0, 0, 0, 0);
-  cd.AssignCallback([this](const auto& args, auto* cntx) { return Command(args, cntx); });
+
+  cd.SetHandler([this](const auto& args, auto* cntx) { return Command(args, cntx); });
   const char* nm = cd.name();
   cmd_map_.emplace(nm, std::move(cd));
 }
 
 void CommandRegistry::Command(CmdArgList args, ConnectionContext* cntx) {
   size_t sz = cmd_map_.size();
-  string resp = absl::StrCat("*", sz, "\r\n");
+  string resp = StrCat("*", sz, "\r\n");
 
   for (const auto& val : cmd_map_) {
     const CommandId& cd = val.second;
     StrAppend(&resp, "*6\r\n$", strlen(cd.name()), "\r\n", cd.name(), "\r\n");
-    StrAppend(&resp, ":", int(cd.arity()), "\r\n", "*", CommandId::OptCount(cd.opt_mask()), "\r\n");
-    uint32_t opt_bit = 1;
+    StrAppend(&resp, ":", int(cd.arity()), "\r\n");
+    StrAppend(&resp, "*", CommandId::OptCount(cd.opt_mask()), "\r\n");
 
-    for (uint32_t i = 1; i < 32; ++i, opt_bit <<= 1) {
-      if (cd.opt_mask() & opt_bit) {
-        const char* name = CO::OptName(CO::CommandOpt{opt_bit});
+    for (uint32_t i = 0; i < 32; ++i) {
+      unsigned obit = (1u << i);
+      if (cd.opt_mask() & obit) {
+        const char* name = CO::OptName(CO::CommandOpt{obit});
         StrAppend(&resp, "+", name, "\r\n");
       }
     }
diff --git a/server/command_registry.h b/server/command_registry.h
index a4a742994..12bc22c9c 100644
--- a/server/command_registry.h
+++ b/server/command_registry.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
@@ -34,7 +34,7 @@ const char* OptName(CommandOpt fl);
 
 class CommandId {
  public:
-  using CmdFunc = std::function<void(CmdArgList, ConnectionContext*)>;
+  using Handler = std::function<void(CmdArgList, ConnectionContext*)>;
 
   /**
    * @brief Construct a new Command Id object
@@ -81,13 +81,13 @@ class CommandId {
     return step_key_;
   }
 
-  CommandId& AssignCallback(CmdFunc f) {
-    func_ = std::move(f);
+  CommandId& SetHandler(Handler f) {
+    handler_ = std::move(f);
     return *this;
   }
 
   void Invoke(CmdArgList args, ConnectionContext* cntx) const {
-    func_(std::move(args), cntx);
+    handler_(std::move(args), cntx);
   }
 
   static const char* OptName(CO::CommandOpt fl);
@@ -102,7 +102,7 @@ class CommandId {
   int8_t last_key_;
   int8_t step_key_;
 
-  CmdFunc func_;
+  Handler handler_;
 };
 
 class CommandRegistry {
diff --git a/server/common_types.cc b/server/common_types.cc
index ab56b5007..2358e1d62 100644
--- a/server/common_types.cc
+++ b/server/common_types.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/common_types.h"
diff --git a/server/common_types.h b/server/common_types.h
index 6300dd88c..57b26936c 100644
--- a/server/common_types.h
+++ b/server/common_types.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/config_flags.cc b/server/config_flags.cc
index 1b6d46a89..736156ce6 100644
--- a/server/config_flags.cc
+++ b/server/config_flags.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 #include "server/config_flags.h"
 
diff --git a/server/config_flags.h b/server/config_flags.h
index 02061a7f5..7c2a4f9f3 100644
--- a/server/config_flags.h
+++ b/server/config_flags.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/conn_context.cc b/server/conn_context.cc
index 44dfeff15..c83d25e8f 100644
--- a/server/conn_context.cc
+++ b/server/conn_context.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/conn_context.h"
diff --git a/server/conn_context.h b/server/conn_context.h
index 9cb70e2be..03ed017a1 100644
--- a/server/conn_context.h
+++ b/server/conn_context.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/db_slice.cc b/server/db_slice.cc
index 36aad1514..16703495a 100644
--- a/server/db_slice.cc
+++ b/server/db_slice.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/db_slice.h"
diff --git a/server/db_slice.h b/server/db_slice.h
index 2dc599645..5ece14ee0 100644
--- a/server/db_slice.h
+++ b/server/db_slice.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/dfly_main.cc b/server/dfly_main.cc
index e4b612ce0..48be53559 100644
--- a/server/dfly_main.cc
+++ b/server/dfly_main.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "base/init.h"
diff --git a/server/dfly_protocol.h b/server/dfly_protocol.h
index 7e867ec2b..522875ad5 100644
--- a/server/dfly_protocol.h
+++ b/server/dfly_protocol.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/dragonfly_connection.cc b/server/dragonfly_connection.cc
index 9724f52ef..fcb35d7e2 100644
--- a/server/dragonfly_connection.cc
+++ b/server/dragonfly_connection.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/dragonfly_connection.h"
diff --git a/server/dragonfly_connection.h b/server/dragonfly_connection.h
index 427a98a10..f7c348354 100644
--- a/server/dragonfly_connection.h
+++ b/server/dragonfly_connection.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/dragonfly_listener.cc b/server/dragonfly_listener.cc
index c0fb6a466..26411f24c 100644
--- a/server/dragonfly_listener.cc
+++ b/server/dragonfly_listener.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/dragonfly_listener.h"
diff --git a/server/dragonfly_listener.h b/server/dragonfly_listener.h
index bd9fc4ec9..af824f8ae 100644
--- a/server/dragonfly_listener.h
+++ b/server/dragonfly_listener.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/engine_shard_set.cc b/server/engine_shard_set.cc
index 8438c1957..501cb5bfc 100644
--- a/server/engine_shard_set.cc
+++ b/server/engine_shard_set.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/engine_shard_set.h"
diff --git a/server/engine_shard_set.h b/server/engine_shard_set.h
index 5899b5991..d1d838ffa 100644
--- a/server/engine_shard_set.h
+++ b/server/engine_shard_set.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/main_service.cc b/server/main_service.cc
index 8ba5cf0ef..8ac0d6ef2 100644
--- a/server/main_service.cc
+++ b/server/main_service.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/main_service.h"
@@ -210,11 +210,11 @@ VarzValue::Map Service::GetVarzStats() {
 }
 
 using ServiceFunc = void (Service::*)(CmdArgList args, ConnectionContext* cntx);
-inline CommandId::CmdFunc HandlerFunc(Service* se, ServiceFunc f) {
+inline CommandId::Handler HandlerFunc(Service* se, ServiceFunc f) {
   return [=](CmdArgList args, ConnectionContext* cntx) { return (se->*f)(args, cntx); };
 }
 
-#define HFUNC(x) AssignCallback(HandlerFunc(this, &Service::x))
+#define HFUNC(x) SetHandler(HandlerFunc(this, &Service::x))
 
 void Service::RegisterCommands() {
   using CI = CommandId;
diff --git a/server/main_service.h b/server/main_service.h
index 6bd4e85d0..dc9fd25da 100644
--- a/server/main_service.h
+++ b/server/main_service.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/memcache_parser.cc b/server/memcache_parser.cc
index 6828d75f4..c53126c78 100644
--- a/server/memcache_parser.cc
+++ b/server/memcache_parser.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 #include "server/memcache_parser.h"
 
diff --git a/server/memcache_parser.h b/server/memcache_parser.h
index cb3280103..908ae90d3 100644
--- a/server/memcache_parser.h
+++ b/server/memcache_parser.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/memcache_parser_test.cc b/server/memcache_parser_test.cc
index 071b28397..09843ebcd 100644
--- a/server/memcache_parser_test.cc
+++ b/server/memcache_parser_test.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/memcache_parser.h"
diff --git a/server/op_status.h b/server/op_status.h
index 44bd5b8d2..19edfb3b6 100644
--- a/server/op_status.h
+++ b/server/op_status.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/redis_parser.cc b/server/redis_parser.cc
index 8cfc09bef..fa6090a1e 100644
--- a/server/redis_parser.cc
+++ b/server/redis_parser.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 #include "server/redis_parser.h"
 
diff --git a/server/redis_parser.h b/server/redis_parser.h
index ecdc1b6c0..a3ec9bb00 100644
--- a/server/redis_parser.h
+++ b/server/redis_parser.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 #pragma once
 
diff --git a/server/redis_parser_test.cc b/server/redis_parser_test.cc
index cd3869ea5..d2e283def 100644
--- a/server/redis_parser_test.cc
+++ b/server/redis_parser_test.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/redis_parser.h"
diff --git a/server/reply_builder.cc b/server/reply_builder.cc
index 56ae00c1a..68af563d7 100644
--- a/server/reply_builder.cc
+++ b/server/reply_builder.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 #include "server/reply_builder.h"
 
diff --git a/server/reply_builder.h b/server/reply_builder.h
index 1f916c497..667f8b835 100644
--- a/server/reply_builder.h
+++ b/server/reply_builder.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 #include <string_view>
 
diff --git a/server/resp_expr.cc b/server/resp_expr.cc
index fa3fe71ca..7d583e095 100644
--- a/server/resp_expr.cc
+++ b/server/resp_expr.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/resp_expr.h"
diff --git a/server/resp_expr.h b/server/resp_expr.h
index e0fc10132..175b3d4cc 100644
--- a/server/resp_expr.h
+++ b/server/resp_expr.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once
diff --git a/server/test_utils.cc b/server/test_utils.cc
index 7a608a258..b06d728ec 100644
--- a/server/test_utils.cc
+++ b/server/test_utils.cc
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #include "server/test_utils.h"
diff --git a/server/test_utils.h b/server/test_utils.h
index 6410d28b3..28ee1221d 100644
--- a/server/test_utils.h
+++ b/server/test_utils.h
@@ -1,5 +1,5 @@
-// Copyright 2021, Beeri 15.  All rights reserved.
-// Author: Roman Gershman (romange@gmail.com)
+// Copyright 2021, Roman Gershman.  All rights reserved.
+// See LICENSE for licensing terms.
 //
 
 #pragma once