diff --git a/core/commands2/id.go b/core/commands2/id.go
index 88a602d8b67d6ce346b929cc5890e107deb845fa..3a0bd6a77be9be47de7055ec04a3a3c31e13087a 100644
--- a/core/commands2/id.go
+++ b/core/commands2/id.go
@@ -16,6 +16,9 @@ import (
 	u "github.com/jbenet/go-ipfs/util"
 )
 
+const offlineIdErrorMessage = `ID command fails when run without daemon, we are working 
+to fix this In the meantime, please run the daemon if you want to use 'ipfs id'`
+
 type IdOutput struct {
 	ID              string
 	PublicKey       string
@@ -26,9 +29,11 @@ type IdOutput struct {
 
 var idCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
-		Tagline: "Show IPFS Node IF info",
-		ShortDescription: `Prints out information about the specified peer,
-		if no peer is specified, prints out local peers info.`,
+		Tagline: "Show IPFS Node ID info",
+		ShortDescription: `
+Prints out information about the specified peer,
+if no peer is specified, prints out local peers info.
+`,
 	},
 	Arguments: nil,
 	Run: func(req cmds.Request) (interface{}, error) {
@@ -50,8 +55,7 @@ var idCmd = &cmds.Command{
 		ctx, _ := context.WithTimeout(context.TODO(), time.Second*5)
 		p, err := node.Routing.FindPeer(ctx, id)
 		if err == kb.ErrLookupFailure {
-			return nil, errors.New(`ID command fails when run without daemon, we are working to fix this
-		In the meantime, please run the daemon if you want to use 'ipfs id'`)
+			return nil, errors.New(offlineIdErrorMessage)
 		}
 		if err != nil {
 			return nil, err
@@ -80,7 +84,7 @@ func printPeer(p peer.Peer) (interface{}, error) {
 	info.ID = p.ID().String()
 	if p.PubKey() == nil {
 		return nil, errors.New(`peer publickey not populated on offline runs,
-		please run the daemon to use ipfs id!`)
+please run the daemon to use ipfs id!`)
 	}
 	pkb, err := p.PubKey().Bytes()
 	if err != nil {
diff --git a/core/commands2/root.go b/core/commands2/root.go
index e847462535f9f6d3d895ea3a70081bb176598bb6..5b91dcced28b4825b77951dd52ae3abe66400c92 100644
--- a/core/commands2/root.go
+++ b/core/commands2/root.go
@@ -32,7 +32,7 @@ Tool commands:
     update        Download and apply go-ipfs updates
     version       Show ipfs version information
     commands      List all available commands
-	id			  Show info about ipfs peers
+	id            Show info about ipfs peers
 
 Advanced Commands: