diff --git a/elvis.config b/elvis.config
index fb7c8d4..9707aa4 100644
--- a/elvis.config
+++ b/elvis.config
@@ -1,26 +1,14 @@
-[
- {
-   elvis,
-   [
-    {config,
-     [#{dirs => ["src"],
-        filter => "*.erl",
-        ruleset => erl_files,
-        rules => [
-            {elvis_style, nesting_level, #{level => 4}},
-            {elvis_style, dont_repeat_yourself, #{min_complexity => 15}}
-        ]
-      },
-      #{dirs => ["."],
-        filter => "rebar.config",
-        ruleset => rebar_config
-      },
-      #{dirs => ["."],
-        filter => "elvis.config",
-        ruleset => elvis_config
-      }
-     ]
-    }
-   ]
- }
-].
+[{elvis,
+  [{config,
+    [#{dirs => ["src"],
+       filter => "*.erl",
+       ruleset => erl_files,
+       rules =>
+           [{elvis_style, nesting_level, #{level => 4}},
+            {elvis_style, dont_repeat_yourself, #{min_complexity => 15}}]},
+     #{dirs => ["."],
+       filter => "rebar.config",
+       ruleset => rebar_config},
+     #{dirs => ["."],
+       filter => "elvis.config",
+       ruleset => elvis_config}]}]}].
diff --git a/old.rebar.config b/old.rebar.config
index aab45fe..7a19811 100644
--- a/old.rebar.config
+++ b/old.rebar.config
@@ -1,5 +1,3 @@
 {erl_opts, [debug_info]}.
 
-{deps, [
-    {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "0.15.2"}}}
-]}.
+{deps, [{jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "0.15.2"}}}]}.
diff --git a/rebar.config b/rebar.config
index cf9a785..29b033c 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,19 +1,18 @@
 % -*- mode: erlang -*-
-{erl_opts, [
-    warn_unused_vars,
-    warn_export_all,
-    warn_shadow_vars,
-    warn_unused_import,
-    warn_unused_function,
-    warn_bif_clash,
-    warn_unused_record,
-    warn_deprecated_function,
-    warn_obsolete_guard,
-    strict_validation,
-    warn_export_vars,
-    warn_exported_vars,
-    debug_info
-]}.
+{erl_opts,
+ [warn_unused_vars,
+  warn_export_all,
+  warn_shadow_vars,
+  warn_unused_import,
+  warn_unused_function,
+  warn_bif_clash,
+  warn_unused_record,
+  warn_deprecated_function,
+  warn_obsolete_guard,
+  strict_validation,
+  warn_export_vars,
+  warn_exported_vars,
+  debug_info]}.
 
 {minimum_otp_vsn, "20"}.
 
@@ -23,29 +22,24 @@
 
 {deps, [{jiffy, "1.0.8"}]}.
 
-{dialyzer, [
-    {warnings, [no_return, error_handling]},
-    {plt_apps, top_level_deps},
-    {plt_extra_apps, []},
-    {plt_location, local},
-    {base_plt_apps, [erts, stdlib, kernel, inets, crypto, ssl]},
-    {base_plt_location, global}
-]}.
-
-{xref_checks,[
-    undefined_function_calls,
-    locals_not_used,
-    deprecated_function_calls,
-    deprecated_functions
-]}.
+{dialyzer,
+ [{warnings, [no_return, error_handling]},
+  {plt_apps, top_level_deps},
+  {plt_extra_apps, []},
+  {plt_location, local},
+  {base_plt_apps, [erts, stdlib, kernel, inets, crypto, ssl]},
+  {base_plt_location, global}]}.
 
-{alias, [{test, [format, lint, hank, xref, dialyzer, eunit, cover]}]}.
+{xref_checks,
+ [undefined_function_calls,
+  locals_not_used,
+  deprecated_function_calls,
+  deprecated_functions]}.
 
-{project_plugins, [
-    {rebar3_hex,    "~> 6.10.2"},
-    {rebar3_format, "~> 0.9.0"},
-    {rebar3_lint,   "~> 0.3.2"},
-    {rebar3_hank,   "~> 0.2.1"}
-]}.
+{alias, [{test, [format, lint, hank, xref, dialyzer, eunit, cover]}]}.
 
-{format, [{files, ["src/*.erl", "include/*.hrl"]}]}.
+{project_plugins,
+ [{rebar3_hex, "~> 6.10.2"},
+  {rebar3_format, "~> 0.10.0"},
+  {rebar3_lint, "~> 0.3.2"},
+  {rebar3_hank, "~> 0.2.1"}]}.
diff --git a/src/erliam.app.src b/src/erliam.app.src
index aeca425..16c0f3e 100644
--- a/src/erliam.app.src
+++ b/src/erliam.app.src
@@ -1,16 +1,10 @@
-{application, erliam,
+{application,
+ erliam,
  [{description, "AWSv4 signature and IAM credential support"},
   {vsn, "git"},
   {registered, [erliam_sup, erliam_srv]},
   {mod, {erliam_app, []}},
-  {applications,
-   [kernel,
-    stdlib,
-    inets,
-    crypto,
-    ssl,
-    jiffy]},
+  {applications, [kernel, stdlib, inets, crypto, ssl, jiffy]},
   {modules, []},
-  {env,[]},
-  {licenses, ["BSD-3-Clause"]}
- ]}.
+  {env, []},
+  {licenses, ["BSD-3-Clause"]}]}.