diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
index a1e6989ced681..329716e6c059d 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
@@ -369,11 +369,10 @@ protected void info(String[] args) throws Exception {
             }
 
             String description = program.getDescription();
+            System.out.println();
             if (description != null) {
-                System.out.println();
                 System.out.println(description);
             } else {
-                System.out.println();
                 System.out.println("No description provided.");
             }
         } finally {
@@ -463,7 +462,7 @@ private <ClusterID> void listJobs(
                 });
 
         if (showRunning || showAll) {
-            if (runningJobs.size() == 0) {
+            if (runningJobs.isEmpty()) {
                 System.out.println("No running jobs.");
             } else {
                 System.out.println(
@@ -474,7 +473,7 @@ private <ClusterID> void listJobs(
             }
         }
         if (showScheduled || showAll) {
-            if (scheduledJobs.size() == 0) {
+            if (scheduledJobs.isEmpty()) {
                 System.out.println("No scheduled jobs.");
             } else {
                 System.out.println(
@@ -485,7 +484,7 @@ private <ClusterID> void listJobs(
             }
         }
         if (showAll) {
-            if (terminatedJobs.size() != 0) {
+            if (!terminatedJobs.isEmpty()) {
                 System.out.println(
                         "---------------------- Terminated Jobs -----------------------");
                 printJobStatusMessages(terminatedJobs);