diff --git a/cmd/geth/shardingcmd.go b/cmd/geth/shardingcmd.go
index 65899ae2fd..5e49140c88 100644
--- a/cmd/geth/shardingcmd.go
+++ b/cmd/geth/shardingcmd.go
@@ -17,7 +17,7 @@ var (
 		Flags:     []cli.Flag{utils.DataDirFlag, utils.PasswordFileFlag, utils.NetworkIdFlag},
 		Category:  "SHARDING COMMANDS",
 		Description: `
-The Geth sharding client connects to a running geth node in sharding mode. This feature is a work in progress.
+Launches a sharding client that connects to a running geth node and proposes collations to a Validator Manager Contract. This feature is a work in progress.
 `,
 	}
 )
diff --git a/sharding/client.go b/sharding/client.go
index 976288972a..334feb337b 100644
--- a/sharding/client.go
+++ b/sharding/client.go
@@ -96,7 +96,7 @@ func (c *Client) Start() error {
 
 // Wait until sharding client is shutdown.
 func (c *Client) Wait() {
-	// TODO: Blocking lock.
+	log.Info("Sharding client has been shutdown...")
 }
 
 // WatchCollationHeaders checks the logs for add_header func calls
@@ -106,14 +106,6 @@ func (c *Client) WatchCollationHeaders() {
 
 }
 
-// dialRPC endpoint to node.
-func dialRPC(endpoint string) (*rpc.Client, error) {
-	if endpoint == "" {
-		endpoint = node.DefaultIPCEndpoint(clientIdentifier)
-	}
-	return rpc.Dial(endpoint)
-}
-
 // UnlockAccount will unlock the specified account using utils.PasswordFileFlag or empty string if unset.
 func (c *Client) unlockAccount(account accounts.Account) error {
 	pass := ""
@@ -153,3 +145,11 @@ func (c *Client) createTXOps() (bind.TransactOpts, error) {
 	}, nil
 
 }
+
+// dialRPC endpoint to node.
+func dialRPC(endpoint string) (*rpc.Client, error) {
+	if endpoint == "" {
+		endpoint = node.DefaultIPCEndpoint(clientIdentifier)
+	}
+	return rpc.Dial(endpoint)
+}