diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c6956cf..44db318b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,9 @@
 
 BREAKING CHANGES:
  - [client] all XxxSync methods now return (ResponseXxx, error)
- - [types] Application: all methods take RequestXxx and return (ResponseXxx, error), 
-   except CheckTx/DeliverTx, which take `tx []byte`, and `Commit`, which takes nothing.
+ - [types] Application: all methods now take RequestXxx and return (ResponseXxx, error).
+    - Except `CheckTx`/`DeliverTx`, which takes a `tx []byte` argument.
+    - Except `Commit`, which takes no arguments.
  - [types] removed Result
 
 FEATURES:
diff --git a/client/socket_client.go b/client/socket_client.go
index 84377a05..7e5a1f30 100644
--- a/client/socket_client.go
+++ b/client/socket_client.go
@@ -14,11 +14,6 @@ import (
 	cmn "github.com/tendermint/tmlibs/common"
 )
 
-const (
-	OK  = types.CodeType_OK
-	LOG = ""
-)
-
 const reqQueueSize = 256 // TODO make configurable
 // const maxResponseSize = 1048576 // 1MB TODO make configurable
 const flushThrottleMS = 20 // Don't wait longer than...
@@ -251,8 +246,8 @@ func (cli *socketClient) CheckTxAsync(tx []byte) *ReqRes {
 	return cli.queueRequest(types.ToRequestCheckTx(tx))
 }
 
-func (cli *socketClient) QueryAsync(reqQuery types.RequestQuery) *ReqRes {
-	return cli.queueRequest(types.ToRequestQuery(reqQuery))
+func (cli *socketClient) QueryAsync(req types.RequestQuery) *ReqRes {
+	return cli.queueRequest(types.ToRequestQuery(req))
 }
 
 func (cli *socketClient) CommitAsync() *ReqRes {