diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs
index 57fd643f0c..f87ad4359a 100644
--- a/cli/tools/lint.rs
+++ b/cli/tools/lint.rs
@@ -229,8 +229,7 @@ impl LintReporter for PrettyLintReporter {
   fn visit_diagnostic(&mut self, d: &LintDiagnostic, source_lines: Vec<&str>) {
     self.lint_count += 1;
 
-    let pretty_message =
-      format!("({}) {}", colors::gray(&d.code), d.message.clone());
+    let pretty_message = format!("({}) {}", colors::red(&d.code), &d.message);
 
     let message = format_diagnostic(
       &d.code,
@@ -302,27 +301,25 @@ pub fn format_diagnostic(
     }
   }
 
-  if let Some(hint) = maybe_hint {
-    format!(
-      "{}\n{}\n    at {}\n\n    {} {}\n    {} for further information visit https://lint.deno.land/#{}",
-      message_line,
-      lines.join("\n"),
-      formatted_location,
-      colors::gray("hint:"),
-      hint,
-      colors::gray("help:"),
-      diagnostic_code,
-    )
+  let hint = if let Some(hint) = maybe_hint {
+    format!("    {} {}\n", colors::cyan("hint:"), hint)
   } else {
-    format!(
-      "{}\n{}\n    at {}\n\n    {} for further information visit https://lint.deno.land/#{}",
-      message_line,
-      lines.join("\n"),
-      formatted_location,
-      colors::gray("help:"),
-      diagnostic_code,
-    )
-  }
+    "".to_string()
+  };
+  let help = format!(
+    "    {} for further information visit https://lint.deno.land/#{}",
+    colors::cyan("help:"),
+    diagnostic_code
+  );
+
+  format!(
+    "{message_line}\n{snippets}\n    at {formatted_location}\n\n{hint}{help}",
+    message_line = message_line,
+    snippets = lines.join("\n"),
+    formatted_location = formatted_location,
+    hint = hint,
+    help = help
+  )
 }
 
 #[derive(Serialize)]