diff --git a/src/katt.erl b/src/katt.erl
index 91e1181..e575047 100644
--- a/src/katt.erl
+++ b/src/katt.erl
@@ -103,7 +103,7 @@ run(From, Scenario, Params, Callbacks) ->
   Failures = lists:filter(FailureFilter, TransactionResults),
   Status = case Failures of
              [] -> pass;
-             _  -> fail
+             _ -> fail
            end,
   Result = {Status, Scenario, Params, FinalParams, TransactionResults},
   From ! {progress, status, Status},
@@ -140,7 +140,7 @@ make_params(ScenarioParams0) ->
   ScenarioParams = [ {katt_util:to_list(K), V} || {K, V} <- ScenarioParams0],
   Protocol = proplists:get_value("protocol", ScenarioParams, ?DEFAULT_PROTOCOL),
   DefaultPort = case Protocol of
-                  ?PROTOCOL_HTTP  -> ?DEFAULT_PORT_HTTP;
+                  ?PROTOCOL_HTTP -> ?DEFAULT_PORT_HTTP;
                   ?PROTOCOL_HTTPS -> ?DEFAULT_PORT_HTTPS
                 end,
   DefaultParams = [ {"protocol", Protocol}
@@ -247,9 +247,9 @@ make_katt_request( #katt_request{headers=Hdrs0, url=Url0, body=Body0} = Req
   Url = make_request_url(Url1, Params),
   Hdrs = RecallFun(headers, Hdrs0, Params, Callbacks),
   [Hdrs, Body] = RecallFun(body, [Hdrs, Body0], Params, Callbacks),
-  Req#katt_request{ url     = Url
+  Req#katt_request{ url = Url
                   , headers = Hdrs
-                  , body    = Body
+                  , body = Body
                   }.
 
 make_katt_response( #katt_response{headers=Hdrs0, body=Body0} = Res
@@ -261,15 +261,15 @@ make_katt_response( #katt_response{headers=Hdrs0, body=Body0} = Res
   Hdrs = RecallFun(headers, Hdrs0, Params, Callbacks),
   [Hdrs, Body] = RecallFun(body, [Hdrs, Body0], Params, Callbacks),
   ParsedBody = ParseFun(Hdrs, Body, Params, Callbacks),
-  Res#katt_response{ headers     = Hdrs
-                   , body        = Body
+  Res#katt_response{ headers = Hdrs
+                   , body = Body
                    , parsed_body = ParsedBody
                    }.
 
 -spec make_request_url( string()
                       , params()
                       ) -> nonempty_string().
-make_request_url(Url = ?PROTOCOL_HTTP "//" ++ _, _Params)  -> Url;
+make_request_url(Url = ?PROTOCOL_HTTP "//" ++ _, _Params) -> Url;
 make_request_url(Url = ?PROTOCOL_HTTPS "//" ++ _, _Params) -> Url;
 make_request_url(Path, Params) ->
   Protocol = proplists:get_value("protocol", Params),
@@ -282,7 +282,7 @@ make_request_url(Path, Params) ->
               ], "").
 
 
-make_host(?PROTOCOL_HTTP,  Hostname, 80)   -> Hostname;
-make_host(?PROTOCOL_HTTPS, Hostname, 443)  -> Hostname;
-make_host(_Proto,          Hostname, Port) ->
+make_host(?PROTOCOL_HTTP, Hostname, 80) -> Hostname;
+make_host(?PROTOCOL_HTTPS, Hostname, 443) -> Hostname;
+make_host(_Proto, Hostname, Port) ->
   Hostname ++ ":" ++ katt_util:to_list(Port).
diff --git a/src/katt_callbacks.erl b/src/katt_callbacks.erl
index 2fd587c..af83cfe 100644
--- a/src/katt_callbacks.erl
+++ b/src/katt_callbacks.erl
@@ -157,12 +157,12 @@ request(R = #katt_request{}, Params, Callbacks) ->
   ParseFun = proplists:get_value(parse, Callbacks),
   case http_request(R, Params) of
     {ok, {{Code, _}, Hdrs, Body}} ->
-      #katt_response{ status      = Code
-                    , headers     = Hdrs
-                    , body        = Body
+      #katt_response{ status = Code
+                    , headers = Hdrs
+                    , body = Body
                     , parsed_body = ParseFun(Hdrs, Body, Params, Callbacks)
                     };
-    Error = {error, _}               ->
+    Error = {error, _} ->
       Error
   end.
 
@@ -176,7 +176,7 @@ request(R = #katt_request{}, Params, Callbacks) ->
 validate( Expected = #katt_response{}
         , Actual = #katt_response{}
         , _Params
-        , Callbacks)                                     ->
+        , Callbacks) ->
   {AddParams0, Failures0} = get_params_and_failures(
                               validate_status(Expected, Actual, Callbacks)),
   {AddParams1, Failures1} = get_params_and_failures(
@@ -188,10 +188,10 @@ validate( Expected = #katt_response{}
   Failures = Failures0 ++ Failures1 ++ Failures2,
   case Failures of
     [] -> {pass, AddParams};
-    _  -> {fail, Failures}
+    _ -> {fail, Failures}
   end;
 validate(Expected, #katt_response{}, _Params, _Callbacks) -> {fail, Expected};
-validate(#katt_response{}, Actual, _Params, _Callbacks)   -> {fail, Actual}.
+validate(#katt_response{}, Actual, _Params, _Callbacks) -> {fail, Actual}.
 
 %% @doc Notify of scenario progress
 %% @end
@@ -233,7 +233,7 @@ http_request( #katt_request{ method = Method
             , Params) ->
   Body = case Body0 of
     null -> <<>>;
-    Bin  -> Bin
+    Bin -> Bin
   end,
   Sleep = case proplists:get_value("x-katt-request-sleep", Hdrs0) of
             undefined ->
diff --git a/src/katt_callbacks_json.erl b/src/katt_callbacks_json.erl
index 28d8cfb..7d80258 100644
--- a/src/katt_callbacks_json.erl
+++ b/src/katt_callbacks_json.erl
@@ -74,7 +74,7 @@ parse(false = _JustCheck, _Hdrs, null, _Params, _Callbacks) ->
   [];
 parse(false = _JustCheck, Hdrs, Body, _Params, _Callbacks) ->
   case is_json_content_type(Hdrs) of
-    true  ->
+    true ->
       parse_json(Body);
     false ->
       katt_util:from_utf8(Body)
diff --git a/src/katt_request.erl b/src/katt_request.erl
index 7b38c0b..a0bce50 100644
--- a/src/katt_request.erl
+++ b/src/katt_request.erl
@@ -62,4 +62,4 @@ set_method(Method, #katt_request{} = Req) -> Req#katt_request{method = Method}.
 get_url(#katt_request{url = Url}) -> Url.
 
 -spec set_url(string(), request()) -> request().
-set_url(Url, #katt_request{} =  Req) -> Req#katt_request{url = Url}.
+set_url(Url, #katt_request{} = Req) -> Req#katt_request{url = Url}.
diff --git a/src/katt_util.erl b/src/katt_util.erl
index e60fa41..4184bc1 100644
--- a/src/katt_util.erl
+++ b/src/katt_util.erl
@@ -55,17 +55,17 @@ merge_proplists(List1, List2) ->
                , orddict:from_list(List2)
                ).
 
-to_list(X) when is_atom(X)    -> atom_to_list(X);
+to_list(X) when is_atom(X) -> atom_to_list(X);
 to_list(X) when is_integer(X) -> integer_to_list(X);
-to_list(X) when is_float(X)   -> my_float_to_list(X);
-to_list(X) when is_binary(X)  -> binary_to_list(X);
-to_list(X) when is_list(X)    -> X.
+to_list(X) when is_float(X) -> my_float_to_list(X);
+to_list(X) when is_binary(X) -> binary_to_list(X);
+to_list(X) when is_list(X) -> X.
 
 %% Transform (possibly utf8 encoded) binary to list, ignore everything else.
 from_utf8(X) when is_binary(X) ->
   case unicode:characters_to_list(X, utf8) of
-    R when is_list(R)  -> R;
-    {error, _, _}      -> binary_to_list(X);
+    R when is_list(R) -> R;
+    {error, _, _} -> binary_to_list(X);
     {incomplete, _, _} -> binary_to_list(X)
   end.