diff --git a/cmd/appserve_abort.go b/cmd/appserve_abort.go
index 28677e3..5019bfd 100644
--- a/cmd/appserve_abort.go
+++ b/cmd/appserve_abort.go
@@ -16,7 +16,6 @@ limitations under the License.
 package cmd
 
 import (
-	"strings"
 	"errors"
 	"fmt"
 	"github.com/spf13/cobra"
@@ -24,6 +23,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strings"
 )
 
 var appserveAbortCmd = &cobra.Command{
@@ -48,9 +48,9 @@ tks appserve abort <APP_ID>`,
 		/* Parse command line params */
 		appId := args[0]
 
-    // Prepare request body
+		// Prepare request body
 		data := url.Values{}
-    data.Set("abort", "true")
+		data.Set("abort", "true")
 
 		// Initialize http client
 		client := &http.Client{}
diff --git a/cmd/appserve_promote.go b/cmd/appserve_promote.go
index 9766926..e2b4c48 100644
--- a/cmd/appserve_promote.go
+++ b/cmd/appserve_promote.go
@@ -16,7 +16,6 @@ limitations under the License.
 package cmd
 
 import (
-	"strings"
 	"errors"
 	"fmt"
 	"github.com/spf13/cobra"
@@ -24,6 +23,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strings"
 )
 
 var appservePromoteCmd = &cobra.Command{
@@ -48,9 +48,9 @@ tks appserve promote <APP_ID>`,
 		/* Parse command line params */
 		appId := args[0]
 
-    // Prepare request body
+		// Prepare request body
 		data := url.Values{}
-    data.Set("promote", "true")
+		data.Set("promote", "true")
 
 		// Initialize http client
 		client := &http.Client{}
diff --git a/cmd/appserve_show.go b/cmd/appserve_show.go
index 60e2a59..e2047f5 100644
--- a/cmd/appserve_show.go
+++ b/cmd/appserve_show.go
@@ -129,6 +129,8 @@ func printAppInfo(app appServeAppTaskCombined, long bool) error {
 	var m map[string]interface{}
 	json.Unmarshal(cBytes, &m)
 
+	// TODO: show fields in proper order manually
+	// or use some ordered-json library
 	fmt.Println("\n**************")
 	fmt.Println("* Basic Info *")
 	fmt.Println("**************")