diff --git a/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp b/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp
index bfa20d00e..210b3c1b2 100644
--- a/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp
+++ b/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp
@@ -123,6 +123,9 @@ static std::set<std::string> LoadIgnoredSymbols(std::string &symbol_list_path) {
   return ignored_symbols;
 }
 
+static const char kWarn[] = "\033[36;1mwarning: \033[0m";
+static const char kError[] = "\033[31;1merror: \033[0m";
+
 int main(int argc, const char **argv) {
   llvm::cl::ParseCommandLineOptions(argc, argv, "header-checker");
   std::set<std::string> ignored_symbols;
@@ -137,15 +140,16 @@ int main(int argc, const char **argv) {
 
   std::string status_str = "";
   std::string unreferenced_change_str = "";
-  std::string error_or_warning_str = "\033[36;1mwarning: \033[0m";
+  std::string error_or_warning_str = kWarn;
+
   switch (status) {
     case abi_util::CompatibilityStatusIR::Incompatible:
-      error_or_warning_str = "\033[31;1merror: \033[0m";
+      error_or_warning_str = kError;
       status_str = "INCOMPATIBLE CHANGES";
       break;
     case abi_util::CompatibilityStatusIR::ElfIncompatible:
       if (elf_unreferenced_symbol_errors) {
-        error_or_warning_str = "\033[31;1merror: \033[0m";
+        error_or_warning_str = kError;
       }
       status_str = "ELF Symbols not referenced by exported headers removed";
       break;
diff --git a/vndk/tools/header-checker/tests/test.py b/vndk/tools/header-checker/tests/test.py
index 102c5145d..a43c22791 100755
--- a/vndk/tools/header-checker/tests/test.py
+++ b/vndk/tools/header-checker/tests/test.py
@@ -9,14 +9,9 @@ import_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 import_path = os.path.abspath(os.path.join(import_path, 'utils'))
 sys.path.insert(1, import_path)
 
-from utils import read_output_content
-from utils import run_header_abi_dumper
-from utils import run_abi_diff
-from utils import SOURCE_ABI_DUMP_EXT
-from utils import TARGET_ARCHS
-from utils import get_build_var
-from utils import make_library
-from utils import AOSP_DIR
+from utils import (
+        AOSP_DIR, SOURCE_ABI_DUMP_EXT, TARGET_ARCHS, read_output_content,
+        run_abi_diff, run_header_abi_dumper)
 from module import Module
 from gen_all import make_and_copy_reference_dumps
 from gen_all import DEFAULT_CFLAGS
diff --git a/vndk/tools/header-checker/utils/create_reference_dumps.py b/vndk/tools/header-checker/utils/create_reference_dumps.py
index b3f7cb2d9..6be3d19b5 100755
--- a/vndk/tools/header-checker/utils/create_reference_dumps.py
+++ b/vndk/tools/header-checker/utils/create_reference_dumps.py
@@ -36,8 +36,8 @@ def main():
     # Parse command line options.
     parser = argparse.ArgumentParser()
     parser.add_argument('--version', help='VNDK version')
-    parser.add_argument('-ref-dump-dir', help='directory to copy reference abi \
-                        dumps into')
+    parser.add_argument('-ref-dump-dir',
+                        help='directory to copy reference abi dumps into')
     args = parser.parse_args()
     num_processed = 0
     soong_dir = os.path.join(AOSP_DIR, 'out', 'soong', '.intermediates')