diff --git a/src/riak_kv_pb_ts.erl b/src/riak_kv_pb_ts.erl
index 6fc44c4e54..b0d95df17a 100644
--- a/src/riak_kv_pb_ts.erl
+++ b/src/riak_kv_pb_ts.erl
@@ -76,16 +76,16 @@ process_stream(Message, ReqId, State) ->
     riak_kv_ts_svc:process_stream(Message, ReqId, State).
 
 encode_response({reply, {tsqueryresp, {_, _, []}}, State}) ->
-    Encoded = #tsqueryresp{columns=[], rows=[]},
+    Encoded = #tsqueryresp{columns = {[], []}, rows = []},
     {reply, Encoded, State};
 encode_response({reply, {tsqueryresp, {CNames, CTypes, Rows}}, State}) ->
-    Encoded = #tsqueryresp{columns=riak_pb_ts_codec:encode_columns(CNames, CTypes),
-                           rows=riak_pb_ts_codec:encode_rows(CTypes, Rows)},
+    Encoded = #tsqueryresp{columns = riak_pb_ts_codec:encode_columns(CNames, CTypes),
+                           rows = riak_pb_ts_codec:encode_rows(CTypes, Rows)},
     {reply, Encoded, State};
 encode_response({reply, {tsgetresp, {CNames, CTypes, Rows}}, State}) ->
     C = riak_pb_ts_codec:encode_columns(CNames, CTypes),
     R = riak_pb_ts_codec:encode_rows(CTypes, Rows),
-    Encoded = #tsgetresp{columns=C, rows=R},
+    Encoded = #tsgetresp{columns = C, rows = R},
     {reply, Encoded, State};
 encode_response(Response) ->
-    Response. 
+    Response.
diff --git a/src/riak_kv_ts_svc.erl b/src/riak_kv_ts_svc.erl
index 7541edd7a6..190294e2e3 100644
--- a/src/riak_kv_ts_svc.erl
+++ b/src/riak_kv_ts_svc.erl
@@ -183,7 +183,8 @@ process_stream({ReqId, Error}, ReqId,
 -spec create_table({?DDL{}, proplists:proplist()}, #state{}) ->
                           {reply, tsqueryresp | #rpberrorresp{}, #state{}}.
 create_table({DDL = ?DDL{table = Table}, WithProps}, State) ->
-    {ok, Props1} = riak_kv_ts_util:apply_timeseries_bucket_props(DDL, riak_ql_ddl_compiler:get_compiler_version(), WithProps),
+    {ok, Props1} = riak_kv_ts_util:apply_timeseries_bucket_props(
+                     DDL, riak_ql_ddl_compiler:get_compiler_version(), WithProps),
     case catch [riak_kv_wm_utils:erlify_bucket_prop(P) || P <- Props1] of
         {bad_linkfun_modfun, {M, F}} ->
             {reply, make_table_create_fail_resp(