diff --git a/cmd/celestia/full.go b/cmd/celestia/full.go
index 643d1a4334..5d5439a9f7 100644
--- a/cmd/celestia/full.go
+++ b/cmd/celestia/full.go
@@ -19,4 +19,5 @@ func init() {
 
 var fullCmd = &cobra.Command{
 	Use: "full [subcommand]",
+	Args: cobra.NoArgs,
 }
\ No newline at end of file
diff --git a/cmd/celestia/light.go b/cmd/celestia/light.go
index fb401f02c4..db2f43ac13 100644
--- a/cmd/celestia/light.go
+++ b/cmd/celestia/light.go
@@ -20,4 +20,5 @@ func init()  {
 
 var lightCmd = &cobra.Command{
 	Use: "light [subcommand]",
+	Args: cobra.NoArgs,
 }
diff --git a/cmd/celestia/main.go b/cmd/celestia/main.go
index 80eac5b227..056ceb59c9 100644
--- a/cmd/celestia/main.go
+++ b/cmd/celestia/main.go
@@ -23,4 +23,11 @@ func run() error {
 
 var rootCmd = &cobra.Command{
 	Use: "celestia [subcommand]",
+	Short: `
+	  / ____/__  / /__  _____/ /_(_)___ _
+	 / /   / _ \/ / _ \/ ___/ __/ / __  /
+	/ /___/  __/ /  __(__  ) /_/ / /_/ /
+	\____/\___/_/\___/____/\__/_/\__,_/
+	`,
+	Args: cobra.NoArgs,
 }
diff --git a/cmd/init.go b/cmd/init.go
index 638cd4207a..c7942c551f 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -18,7 +18,8 @@ func Init(repoName string, tp node.Type) *cobra.Command {
 
 	const cfgName = "config"
 	cmd := &cobra.Command{
-		Use: "init [subcommand]",
+		Use: "init",
+		Args: cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfgF := cmd.Flag(cfgName).Value
 			repo := cmd.Flag(repoName).Value.String()